From 6de73491d697ca92c8b8b7fcc9c445fe6f9f5d5d Mon Sep 17 00:00:00 2001
From: Mathieu Bultel <mat.bultel@gmail.com>
Date: Wed, 10 Feb 2021 09:53:44 +0100
Subject: [PATCH] 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
---
 scripts/tripleo-ansible-inventory | 9 +++++----
 tripleo_validations/utils.py      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/tripleo-ansible-inventory b/scripts/tripleo-ansible-inventory
index d25d9a564..2495d7cd9 100755
--- a/scripts/tripleo-ansible-inventory
+++ b/scripts/tripleo-ansible-inventory
@@ -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:
diff --git a/tripleo_validations/utils.py b/tripleo_validations/utils.py
index 1842115ae..9e8294599 100644
--- a/tripleo_validations/utils.py
+++ b/tripleo_validations/utils.py
@@ -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):