summaryrefslogtreecommitdiffstats
path: root/bin/openshift_ansible
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2016-03-14 15:24:59 -0400
committerKenny Woodson <kwoodson@redhat.com>2016-03-14 15:37:24 -0400
commit8279c9423d1e2166db04c256e3b475583537888b (patch)
tree1f4284abb0e56b85da692b96585e0add9f820cf7 /bin/openshift_ansible
parent00ccce6741369f5cffdcca2a9511c57e3aff4b47 (diff)
downloadopenshift-8279c9423d1e2166db04c256e3b475583537888b.tar.gz
openshift-8279c9423d1e2166db04c256e3b475583537888b.tar.bz2
openshift-8279c9423d1e2166db04c256e3b475583537888b.tar.xz
openshift-8279c9423d1e2166db04c256e3b475583537888b.zip
Updating our metadata tooling to work without env
Diffstat (limited to 'bin/openshift_ansible')
-rw-r--r--bin/openshift_ansible/awsutil.py10
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