Merge "Partial-Bug: #1460456" into R2.20

Juniper · Jun 16, 2015 · a2dea19 · a2dea19
2 parents 7a3300a + 94874ce
commit a2dea19
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/contrail_provisioning/vcenter_plugin/setup.py b/contrail_provisioning/vcenter_plugin/setup.py
@@ -61,6 +61,8 @@ def fixup_contrail_vcenter_plugin(self):
         self._template_substitute_write(contrail_vcenter_plugin_conf.template,
                                    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))
+        #disable contrail-svc-monitor for vcenter as orchestrator based provisioning
+        local("sudo rm /etc/contrail/supervisord_config_files/contrail-svc-monitor.ini")
 
     def run_services(self):
         local("sudo vcenter-plugin-setup.sh")