Merge "Remove svc-monitor status for vcenter-only mode"

Juniper · May 2, 2016 · 1854edf · 1854edf
2 parents 02069e0 + e266b86
commit 1854edf
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/contrail_provisioning/vcenter_plugin/setup.py b/contrail_provisioning/vcenter_plugin/setup.py
@@ -95,6 +95,16 @@ def fixup_contrail_vcenter_plugin(self):
                                    template_vals, self._temp_dir_name + '/contrail-vcenter-plugin.conf')
         local("sudo mv %s/contrail-vcenter-plugin.conf /etc/contrail/contrail-vcenter-plugin.conf" %(self._temp_dir_name))
 
+        if self._args.vcenter_mode == "vcenter-only":
+           #disable contrail-svc-monitor for vcenter as orchestrator based provisioning
+           if (os.path.isfile('/etc/contrail/supervisord_config_files/contrail-svc-monitor.ini')):
+              local("sudo rm /etc/contrail/supervisord_config_files/contrail-svc-monitor.ini")
+              update_cmd = "sudo supervisorctl -s unix:///tmp/supervisord_config.sock update"
+              out = local(update_cmd, capture=True)
+              # Retry until the svc-monitor is removed from the group
+              while 'not removing' in out:
+                  out = local(update_cmd, capture=True)
+
     def run_services(self):
         local("sudo vcenter-plugin-setup.sh")