Merge "Modifying the restore section as per the release. Closes-Bug:1…

…485064 Backing up and restoring all the .conf and .ini files that we change during provisioning before and after upgrade resp. Closes-Bug:1477424"
Juniper · Sep 3, 2015 · 9b47100 · 9b47100
2 parents 1486b4f + 7497bb2
commit 9b47100
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 12 deletions.
diff --git a/contrail_provisioning/collector/upgrade.py b/contrail_provisioning/collector/upgrade.py
@@ -26,7 +26,11 @@ def update_upgrade_data(self):
             '/etc/contrail/contrail-analytics-api.conf',
             '/etc/contrail/contrail-collector.conf',
             '/etc/contrail/contrail-query-engine.conf',
-                                              ]
+                                        ]
+
+        if (self._args.from_rel >= 2.2):
+            self.upgrade_data['restore'].append('/etc/contrail/contrail-analytics-nodemgr.conf')
+
     def update_config(self):
         # DEvlop
         pass

diff --git a/contrail_provisioning/compute/upgrade.py b/contrail_provisioning/compute/upgrade.py
@@ -30,10 +30,15 @@ def update_upgrade_data(self):
             self.upgrade_data['backup'].append('/etc/libvirt')
 
         self.upgrade_data['restore'] += ['/etc/contrail/agent_param',
-                                 '/etc/contrail/contrail-vrouter-agent.conf',
-                                 '/etc/contrail/vrouter_nodemgr_param',
-                                 '/etc/nova/nova.conf',
-                                 '/etc/libvirt/qemu.conf']
+                                     '/etc/contrail/contrail-vrouter-agent.conf',
+                                     '/etc/contrail/vrouter_nodemgr_param',
+                                     '/etc/nova/nova.conf',
+                                     '/etc/libvirt/qemu.conf',
+                                        ]
+
+        if (self._args.from_rel >= 2.2):
+            self.upgrade_data['restore'].append('/etc/contrail/contrail-vrouter-nodemgr.conf')
+
         if self.pdist in ['Ubuntu']:
             self.upgrade_data['restore'].append(
                                     '/etc/nova/nova-compute.conf')

diff --git a/contrail_provisioning/config/upgrade.py b/contrail_provisioning/config/upgrade.py
@@ -30,14 +30,28 @@ def update_upgrade_data(self):
         if self.pdist in ['centos', 'redhat']:
             if (self._args.from_rel < 2.0 and self._args.to_rel >= 2.2):
                 ifmap_dir = '/etc/irond'
-        self.upgrade_data['backup'] += [ifmap_dir, '/etc/neutron']
+        self.upgrade_data['backup'] += [ifmap_dir, '/etc/neutron',
+                                    '/etc/init.d/contrail-api',
+                                    '/etc/init.d/contrail-discovery',
+                                    '/etc/sudoers.d/contrail_sudoers',
+                                       ]
 
         self.upgrade_data['restore'] += ['/etc/contrail/vnc_api_lib.ini',
-                                     '/etc/contrail/contrail-svc-monitor.conf',
-                                     '/etc/contrail/contrail-schema.conf',
-                                     '/etc/contrail/contrail-api.conf',
-                                     '/etc/contrail/contrail-discovery.conf',
-                                             ]
+                                   '/etc/contrail/contrail-svc-monitor.conf',
+                                   '/etc/contrail/contrail-schema.conf',
+                                   '/etc/contrail/contrail-api.conf',
+                                   '/etc/contrail/contrail-discovery.conf',
+                                   '/etc/contrail/supervisord_config_files/contrail-api.ini',
+                                   '/etc/contrail/supervisord_config_files/contrail-discovery.ini',
+                                   '/etc/sudoers.d/contrail_sudoers',
+                                   '/etc/init.d/contrail-api',
+                                   '/etc/init.d/contrail-discovery',
+                                        ]
+
+        if (self._args.from_rel >= 2.2):
+            self.upgrade_data['restore'].append('/etc/contrail/contrail-config-nodemgr.conf')
+        if (self._args.from_rel >= 2.1):
+            self.upgrade_data['restore'].append('/etc/contrail/contrail-device-manager.conf')
 
     def upgrade(self):
         self._upgrade()

diff --git a/contrail_provisioning/control/upgrade.py b/contrail_provisioning/control/upgrade.py
@@ -25,7 +25,11 @@ def update_upgrade_data(self):
                             '/etc/contrail/contrail-dns.conf',
                             '/etc/contrail/dns/contrail-named.conf',
                             '/etc/contrail/dns/contrail-rndc.conf',
-                            '/etc/contrail/dns/contrail-named.pid'] 
+                            '/etc/contrail/dns/contrail-named.pid',
+                                        ]
+
+        if (self._args.from_rel >= 2.2):
+            self.upgrade_data['restore'].append('/etc/contrail/contrail-control-nodemgr.conf')
 
     def restart(self):
         local('service supervisor-control restart')