1. Stopping the supervisor-vrouter during upgrade only if the service…

… is running 2. Setting the minimum_diskGB in contrail-database-nodemgr.conf during upgrade Closes-Bug:1458290 Change-Id: Iae878dc45d7636982552915ff63ecd57a9e09201
Juniper · May 28, 2015 · b4b161f · b4b161f
1 parent caa3df9
commit b4b161f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/contrail_provisioning/compute/upgrade.py b/contrail_provisioning/compute/upgrade.py
@@ -62,7 +62,9 @@ def fix_nova_params(self):
 
     def upgrade(self):
         self._upgrade()
-        local("service supervisor-vrouter stop")
+        if ('running' in
+            local('service supervisor-vrouter status', capture=True)):
+            local("service supervisor-vrouter stop")
         self.upgrade_python_pkgs()
         if self._args.from_rel == 2.0:
             self.fix_nova_params()

diff --git a/contrail_provisioning/database/upgrade.py b/contrail_provisioning/database/upgrade.py
@@ -34,9 +34,6 @@ def upgrade(self):
             self.fixup_kafka_server_properties()
             # Adding hostip in contrail-database-nodemgr.conf
             self.fixup_contrail_database_nodemgr()
-            local('openstack-config --del\
-                  /etc/contrail/contrail-database-nodemgr.conf\
-                  DEFAULT minimum_diskGB')
         self.restart()