vkmc pushed to openstack-trove (master). "Removed mariadb-server as a dependency (..more)"

[notifications at fedoraproject.org]

>From 86dc7a22c5be9518833a3dead0191e5bf473bf8f Mon Sep 17 00:00:00 2001
From: Victoria Martinez de la Cruz <victoria at redhat.com>
Date: Wed, 6 May 2015 07:04:25 -0300
Subject: Removed mariadb-server as a dependency

mariadb-server was conflicting with mariadb-galera-server.
This dependency was needed to fix the case in which when
Trove services started and mariadb wasn't running, Trove would
fail. To fix this, instead, we added a restart on-failure
directive in the .service file for each Trove service.

diff --git a/openstack-trove-api.service b/openstack-trove-api.service
index 80532f0..0b0b19e 100644
--- a/openstack-trove-api.service
+++ b/openstack-trove-api.service
@@ -6,6 +6,7 @@ After=syslog.target network.target mariadb.service
 Type=simple
 User=trove
 ExecStart=/usr/bin/trove-api
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
diff --git a/openstack-trove-conductor.service b/openstack-trove-conductor.service
index 519ffc4..ccda4fc 100644
--- a/openstack-trove-conductor.service
+++ b/openstack-trove-conductor.service
@@ -6,6 +6,7 @@ After=syslog.target network.target mariadb.service
 Type=simple
 User=trove
 ExecStart=/usr/bin/trove-conductor
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
diff --git a/openstack-trove-guestagent.service b/openstack-trove-guestagent.service
index e47bf47..ddd8ae1 100644
--- a/openstack-trove-guestagent.service
+++ b/openstack-trove-guestagent.service
@@ -6,6 +6,7 @@ After=syslog.target network.target
 Type=simple
 User=trove
 ExecStart=/usr/bin/trove-guestagent --config-file /usr/share/trove/trove-dist.conf --config-file /etc/trove/trove-guestagent.conf --config-file /etc/guest_info
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
diff --git a/openstack-trove-taskmanager.service b/openstack-trove-taskmanager.service
index d29c83a..bf887bb 100644
--- a/openstack-trove-taskmanager.service
+++ b/openstack-trove-taskmanager.service
@@ -6,6 +6,7 @@ After=syslog.target network.target mariadb.service
 Type=simple
 User=trove
 ExecStart=/usr/bin/trove-taskmanager
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
diff --git a/openstack-trove.spec b/openstack-trove.spec
index 481d469..1de6b57 100644
--- a/openstack-trove.spec
+++ b/openstack-trove.spec
@@ -58,7 +58,6 @@ between all the OpenStack %{project} services.
 
 %package api
 Summary:          OpenStack %{project} API service
-Requires:         mariadb-server
 Requires:         %{name}-common = %{version}-%{release}
 
 %description api
@@ -69,7 +68,6 @@ This package contains the %{project} interface daemon.
 
 %package taskmanager
 Summary:          OpenStack %{project} taskmanager service
-Requires:         mariadb-server
 Requires:         %{name}-common = %{version}-%{release}
 
 %description taskmanager
@@ -80,7 +78,6 @@ This package contains the %{project} taskmanager service.
 
 %package conductor
 Summary:          OpenStack %{project} conductor service
-Requires:         mariadb-server
 Requires:         %{name}-common = %{version}-%{release}
 
 %description conductor
@@ -352,6 +349,10 @@ exit 0
 %endif
 
 %changelog
+* Wed May 06 2015 Victoria Martinez de la Cruz <vkmc at fedoraproject.org> - 2014.2.3-3
+- Remove deps to mariadb service to openstack-trove-{api,conductor,taskmanager} and
+adds restarts on failure
+
 * Thu Apr 16 2015 Haïkel Guémar <hguemar at fedoraproject.org> - 2014.2.3-2
 - Add deps to mariadb service to openstack-trove-{api,conductor,taskmanager}
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/openstack-trove.git/commit/?h=master&id=86dc7a22c5be9518833a3dead0191e5bf473bf8f