x/stacklight-integration-tests
Code Issues Proposed changes

Merge "Use the dedicated virtual IP for Nagios UI"

Browse Source
This commit is contained in:
Jenkins 2016-06-23 15:47:21 +00:00 committed by Gerrit Code Review
commit 5517dcbada
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stacklight_tests/lma_infrastructure_alerting/api.py
View File

@ -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")

2
stacklight_tests/lma_infrastructure_alerting/plugin_settings.py
View File

@ -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)