US2801 changing all 'password' to 'pwd' on environment_configs and test data

Change-Id: I1e9615d7144a06b99ae0e04a2b2388194854e16a
Signed-off-by: Yaron Yogev <yaronyogev@gmail.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/app/discover/events/listeners/default_listener.py b/app/discover/events/listeners/default_listener.py
index a135673..9261cf8 100755
--- a/app/discover/events/listeners/default_listener.py
+++ b/app/discover/events/listeners/default_listener.py
@@ -189,6 +189,8 @@ class DefaultListener(ListenerBase, ConsumerMixin):
         inventory_collection = args["inventory"]
 
         MongoAccess.set_config_file(args["mongo_config"])
+        inv = InventoryMgr()
+        inv.set_collections(inventory_collection)
         conf = Configuration(args["environments_collection"])
         conf.use_env(env_name)
 
@@ -207,15 +209,13 @@ class DefaultListener(ListenerBase, ConsumerMixin):
         if args["metadata_file"]:
             import_metadata(event_handler, event_queues, args["metadata_file"])
 
-        inv = InventoryMgr()
-        inv.set_collections(inventory_collection)
         logger = FullLogger()
         logger.set_loglevel(args["loglevel"])
 
         amqp_config = conf.get("AMQP")
         connect_url = 'amqp://{user}:{pwd}@{host}:{port}//' \
             .format(user=amqp_config["user"],
-                    pwd=amqp_config["password"],
+                    pwd=amqp_config["pwd"],
                     host=amqp_config["host"],
                     port=amqp_config["port"])
 
diff --git a/app/discover/fetchers/db/db_access.py b/app/discover/fetchers/db/db_access.py
index 00bd776..ffe539d 100644
--- a/app/discover/fetchers/db/db_access.py
+++ b/app/discover/fetchers/db/db_access.py
@@ -66,7 +66,7 @@ class DbAccess(Fetcher):
         cnf = self.conf
         cnf['schema'] = cnf['schema'] if 'schema' in cnf else 'nova'
         self.db_connect(cnf["host"], cnf["port"],
-                        cnf["user"], cnf["password"],
+                        cnf["user"], cnf["pwd"],
                         cnf["schema"])
 
     def get_objects_list_for_id(self, query, object_type, id):