diff options
| author |   Koren Lev <korenlev@gmail.com> | 2017-10-24 13:35:42 +0300 |
|---|---|---|
| committer | Koren Lev <korenlev@gmail.com> | 2017-10-24 10:38:56 +0000 |
| commit | 78b0f48b178325c74d5609bac5c764ac111ad808 (patch) | |
| tree | 80cb343392677253d1cd57b1d641a304b61deff8 /app/monitoring | |
| parent | fb90353f2bf5f3c20b5ada3df2ef3f7c1bee47b8 (diff) | |
several bug fixes for release 1.1opnfv-5.1.RC1opnfv-5.1.0
Change-Id: I433d41245107a68959efdcd6b56ce3348c7bbeb5
Signed-off-by: Koren Lev <korenlev@gmail.com>
(cherry picked from commit 7cba26258ea17f790028a7005cb9bbbdc3923389)
Diffstat (limited to 'app/monitoring')
| -rw-r--r-- | app/monitoring/setup/monitoring_setup_manager.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/app/monitoring/setup/monitoring_setup_manager.py b/app/monitoring/setup/monitoring_setup_manager.py index 9faf5b8..bc4fe01 100644 --- a/app/monitoring/setup/monitoring_setup_manager.py +++ b/app/monitoring/setup/monitoring_setup_manager.py @@ -40,14 +40,13 @@ class MonitoringSetupManager(MonitoringHandler): if self.provision == self.provision_levels['none']: self.log.debug('Monitoring config setup skipped') return - sensu_server_files = [ - 'transport.json', - 'client.json', - 'rabbitmq.json', - 'handlers.json', - 'redis.json', - 'api.json' - ] + sensu_server_files_templates = \ + self.inv.find({'side': 'server'}, + projection={'type': 1}, + collection='monitoring_config_templates') + sensu_server_files = [] + for f in sensu_server_files_templates: + sensu_server_files.append(f.get('type', '')) conf = self.env_monitoring_config is_container = bool(conf.get('ssh_user', '')) server_host = conf['server_ip'] |