From 3551d601f5cd7f4b3430b2222a2e288eaf986269 Mon Sep 17 00:00:00 2001 From: Swann Croiset Date: Tue, 21 Jun 2016 18:06:12 +0200 Subject: [PATCH] Use the dedicated virtual IP for Nagios UI Change-Id: I68b3ff1625e7165a9f4d0a2afdbb268d49ca871f --- stacklight_tests/lma_infrastructure_alerting/api.py | 6 +++++- .../lma_infrastructure_alerting/plugin_settings.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/stacklight_tests/lma_infrastructure_alerting/api.py b/stacklight_tests/lma_infrastructure_alerting/api.py index b391ab3..a640cdd 100644 --- a/stacklight_tests/lma_infrastructure_alerting/api.py +++ b/stacklight_tests/lma_infrastructure_alerting/api.py @@ -38,7 +38,11 @@ class InfraAlertingPluginApi(base_test.PluginApi): self.settings.name, self.settings.version, options) def get_plugin_vip(self): - return self.helpers.get_plugin_vip(self.settings.vip_name) + try: + return self.helpers.get_plugin_vip( + 'infrastructure_alerting_mgmt_vip') + except Exception: + return self.helpers.get_plugin_vip(self.settings.vip_name) def check_plugin_online(self): logger.info("Check that the Nagios server is running") diff --git a/stacklight_tests/lma_infrastructure_alerting/plugin_settings.py b/stacklight_tests/lma_infrastructure_alerting/plugin_settings.py index 42f36f4..48d49eb 100644 --- a/stacklight_tests/lma_infrastructure_alerting/plugin_settings.py +++ b/stacklight_tests/lma_infrastructure_alerting/plugin_settings.py @@ -17,7 +17,7 @@ from stacklight_tests import settings name = 'lma_infrastructure_alerting' role_name = ['infrastructure_alerting'] -vip_name = 'infrastructure_alerting_mgmt_vip' +vip_name = 'infrastructure_alerting_ui' plugin_path = settings.LMA_INFRA_ALERTING_PLUGIN_PATH version = helpers.get_plugin_version(plugin_path)