Merge pull request #1598 from kwoodson/metafix

Updates for metadata tooling to work without env.

1 files changed, 5 insertions, 5 deletions

diff --git a/bin/openshift_ansible/awsutil.py b/bin/openshift_ansible/awsutil.py
index eba11e851..11651f087 100644
--- a/bin/openshift_ansible/awsutil.py
+++ b/bin/openshift_ansible/awsutil.py
@@ -137,13 +137,13 @@ class AwsUtil(object):
         inst_by_env = {}
         for _, host in inv['_meta']['hostvars'].items():
             # If you don't have an environment tag, we're going to ignore you
-            if 'ec2_tag_environment' not in host:
+            if 'oo_environment' not in host:
                 continue
 
-            if host['ec2_tag_environment'] not in inst_by_env:
-                inst_by_env[host['ec2_tag_environment']] = {}
-            host_id = "%s:%s" % (host['ec2_tag_Name'], host['ec2_id'])
-            inst_by_env[host['ec2_tag_environment']][host_id] = host
+            if host['oo_environment'] not in inst_by_env:
+                inst_by_env[host['oo_environment']] = {}
+            host_id = "%s:%s" % (host['oo_name'], host['oo_id'])
+            inst_by_env[host['oo_environment']][host_id] = host
 
         return inst_by_env