openstack
/
tripleo-validations
Code Issues Proposed changes

Merge "Fix set by merging two list without duplicate" into stable/ussuri

This commit is contained in:
Zuul 2021-04-20 11:36:25 +00:00 committed by Gerrit Code Review
parent e85c110268 9b2d173deb
commit 2deee29ca6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/tripleo-ansible-inventory
View File

@ -130,8 +130,9 @@ def write_static_inventory(inventory_file_path, inventory):
def main(): def main():
configs = _parse_config() configs = _parse_config()
auth_variables = {}
if configs.auth_url: if configs.auth_url:
auth_variables = { auth_variables.update({
'auth_url': configs.auth_url, 'auth_url': configs.auth_url,
'username': configs.username, 'username': configs.username,
'project_name': configs.project_name, 'project_name': configs.project_name,
@ -139,13 +140,13 @@ def main():
'password': configs.password, 'password': configs.password,
'cacert': configs.cacert, 'cacert': configs.cacert,
'timeout': 30 'timeout': 30
} })
elif configs.os_cloud: elif configs.os_cloud:
config = os_client_config.OpenStackConfig() config = os_client_config.OpenStackConfig()
for cloud in config.get_all_clouds(): for cloud in config.get_all_clouds():
if cloud.name == configs.os_cloud: if cloud.name == configs.os_cloud:
try: try:
auth_variables = { auth_variables.update({
'auth_url': cloud.config['auth'].get('auth_url'), 'auth_url': cloud.config['auth'].get('auth_url'),
'username': cloud.config['auth'].get('username'), 'username': cloud.config['auth'].get('username'),
'project_name': 'project_name':
@ -155,7 +156,7 @@ def main():
'password': cloud.config['auth'].get('password'), 'password': cloud.config['auth'].get('password'),
'cacert': cloud.config.get('cacert'), 'cacert': cloud.config.get('cacert'),
'timeout': cloud.config.get('api_timeout') 'timeout': cloud.config.get('api_timeout')
} })
except KeyError: except KeyError:
raise KeyError("Missing values in clouds.yaml format") raise KeyError("Missing values in clouds.yaml format")
else: else:

2
tripleo_validations/utils.py
View File

@ -101,7 +101,7 @@ def list_plan_and_stack(hclient, swiftclient):
plan_list.append(ac['name']) plan_list.append(ac['name'])
except swiftexceptions.ClientException: except swiftexceptions.ClientException:
return None return None
return list(set(stacks).intersection(list(plan_list))) return list(set(stacks).union(plan_list))
def filtered(obj): def filtered(obj):