From e1c5dd0158d5168738fcc9918d24c04ca724b056 Mon Sep 17 00:00:00 2001 From: dongwenjuan Date: Tue, 18 Dec 2018 11:39:14 +0800 Subject: remove to set ceilometer config in MCP As Mcp already set the notifier for alarm in ceilometer configuration, we remove the configuration workaround. JIRA: DOCTOR-132 Change-Id: I30603d7f364fbbed143ebdb3dc6fdf71b10434a0 Signed-off-by: dongwenjuan --- doctor_tests/installer/mcp.py | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'doctor_tests/installer') diff --git a/doctor_tests/installer/mcp.py b/doctor_tests/installer/mcp.py index 9cfff92d..80e559ed 100644 --- a/doctor_tests/installer/mcp.py +++ b/doctor_tests/installer/mcp.py @@ -14,8 +14,6 @@ from doctor_tests.installer.base import BaseInstaller class McpInstaller(BaseInstaller): node_user_name = 'ubuntu' - cm_set_script = 'set_ceilometer.py' - cm_restore_script = 'restore_ceilometer.py' def __init__(self, conf, log): super(McpInstaller, self).__init__(conf, log) @@ -71,20 +69,5 @@ class McpInstaller(BaseInstaller): def set_apply_patches(self): self.log.info('Set apply patches start......') - restart_cm_cmd = 'sudo service ceilometer-agent-notification restart' - for node_ip in self.controllers: - client = SSHClient(node_ip, self.node_user_name, - key_filename=self.key_file) - self.controller_clients.append(client) - self._run_apply_patches(client, - restart_cm_cmd, - [self.cm_set_script]) - def restore_apply_patches(self): self.log.info('restore apply patches start......') - - restart_cm_cmd = 'sudo service ceilometer-agent-notification restart' - for client in self.controller_clients: - self._run_apply_patches(client, - restart_cm_cmd, - [self.cm_restore_script]) -- cgit 1.2.3-korg