monasca-setup httpcheck args plugin: keystone_config
* httpcheck args plugin setup now creates keystone_config in init_config only if required. * unecessary keystone_config section in init_config for http_check.yaml file would cause all http check instances to fail because of missing keystone credentials like e.g. keystone_url, username, password, project. * This change creates a keystone_config section in init_config only if keystone_url is being passed as an argument during httpcheck plugin setup. Story: 2005296 Task: 30182 Change-Id: Id31d2e5b5d22cb6c6f1fbdb942dac4b1b5aea76d
This commit is contained in:
parent
2099661acb
commit
9375de2876
|
@ -56,12 +56,15 @@ class HttpCheck(monasca_setup.detection.ArgsPlugin):
|
||||||
instance = self._build_instance(['url', 'timeout', 'username', 'password',
|
instance = self._build_instance(['url', 'timeout', 'username', 'password',
|
||||||
'match_pattern', 'disable_ssl_validation',
|
'match_pattern', 'disable_ssl_validation',
|
||||||
'name', 'use_keystone', 'collect_response_time'])
|
'name', 'use_keystone', 'collect_response_time'])
|
||||||
init_config = {'keystone_config': self._build_instance(['keystone_url',
|
|
||||||
'keystone_project',
|
init_config = None
|
||||||
'keystone_project_domain',
|
if 'keystone_url' in self.args:
|
||||||
'keystone_user',
|
init_config = {'keystone_config': self._build_instance(['keystone_url',
|
||||||
'keystone_user_domain',
|
'keystone_project',
|
||||||
'keystone_password'])}
|
'keystone_project_domain',
|
||||||
|
'keystone_user',
|
||||||
|
'keystone_user_domain',
|
||||||
|
'keystone_password'])}
|
||||||
|
|
||||||
# Normalize any boolean parameters
|
# Normalize any boolean parameters
|
||||||
for param in ['use_keystone', 'collect_response_time']:
|
for param in ['use_keystone', 'collect_response_time']:
|
||||||
|
@ -74,22 +77,22 @@ class HttpCheck(monasca_setup.detection.ArgsPlugin):
|
||||||
instance['name'] = self.args['url']
|
instance['name'] = self.args['url']
|
||||||
|
|
||||||
# Configure http check wide Keystone settings
|
# Configure http check wide Keystone settings
|
||||||
if 'keystone_project' in init_config['keystone_config']:
|
if init_config and ('keystone_config' in init_config):
|
||||||
init_config['keystone_config']['project_name'] = init_config['keystone_config']\
|
if 'keystone_project' in init_config['keystone_config']:
|
||||||
.pop('keystone_project')
|
init_config['keystone_config']['project_name'] = init_config['keystone_config']\
|
||||||
if 'keystone_project_domain' in init_config['keystone_config']:
|
.pop('keystone_project')
|
||||||
init_config['keystone_config']['project_domain_name'] = \
|
if 'keystone_project_domain' in init_config['keystone_config']:
|
||||||
init_config['keystone_config'].pop('keystone_project_domain')
|
init_config['keystone_config']['project_domain_name'] = \
|
||||||
if 'keystone_user' in init_config['keystone_config']:
|
init_config['keystone_config'].pop('keystone_project_domain')
|
||||||
init_config['keystone_config']['username'] = init_config['keystone_config']\
|
if 'keystone_user' in init_config['keystone_config']:
|
||||||
.pop('keystone_user')
|
init_config['keystone_config']['username'] = init_config['keystone_config']\
|
||||||
if 'keystone_user_domain' in init_config['keystone_config']:
|
.pop('keystone_user')
|
||||||
init_config['keystone_config']['user_domain_name'] = \
|
if 'keystone_user_domain' in init_config['keystone_config']:
|
||||||
init_config['keystone_config'].pop('keystone_user_domain')
|
init_config['keystone_config']['user_domain_name'] = \
|
||||||
if 'keystone_password' in init_config['keystone_config']:
|
init_config['keystone_config'].pop('keystone_user_domain')
|
||||||
init_config['keystone_config']['password'] = init_config['keystone_config']\
|
if 'keystone_password' in init_config['keystone_config']:
|
||||||
.pop('keystone_password')
|
init_config['keystone_config']['password'] = init_config['keystone_config']\
|
||||||
|
.pop('keystone_password')
|
||||||
|
|
||||||
config['http_check'] = {'init_config': init_config, 'instances': [instance]}
|
config['http_check'] = {'init_config': init_config, 'instances': [instance]}
|
||||||
|
|
||||||
return config
|
return config
|
||||||
|
|
Loading…
Reference in New Issue