openstack
/
tripleo-validations
Code Issues Proposed changes

Fix set by merging two list without duplicate 

The previous statement result to an empty list, this
fix merge the two list and avoid duplicate

Declare auth_variables dictionary to avoid
reference before assignment issues

Change-Id: Ie28357d692f604c647d0f252a932242024e84f6e
Closes-Bug: #1914084
This commit is contained in:
Mathieu Bultel 2021-02-10 09:53:44 +01:00 committed by mbu
parent a08c2deabb
commit 6de73491d6
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

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

2
tripleo_validations/utils.py
View File

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