Merge "Fixes: R3.1.1.x build2 - liberty HA setup, setup_all fails whi…

…le provisioning ceilometer"
Juniper · Feb 10, 2017 · d9b791a · d9b791a
2 parents 49b4590 + 27a6c32
commit d9b791a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/contrail_provisioning/openstack/setup.py b/contrail_provisioning/openstack/setup.py
@@ -299,6 +299,11 @@ def fixup_config_files(self):
             local("sudo sed -i 's/admin_password = /;admin_password = /' /etc/cinder/api-paste.ini")
 
     def run_services(self):
+        with settings(warn_only=True):
+            # Stop the openstack services if they are running
+            # before running the setup
+            for service in self.openstack_services:
+                local("service %s stop" % service)
         local("sudo keystone-server-setup.sh")
         local("sudo glance-server-setup.sh")
         local("sudo cinder-server-setup.sh")