diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2016-03-14 15:41:24 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2016-03-14 15:41:24 -0400 |
| commit | 4c6290bba977fea444c1758d74610c9dbf73be4e (patch) | |
| tree | 65f9bdd49f44ef6a242144214e996ff6c72a8950 /bin/openshift_ansible | |
| parent | f4687e333679748341326e8d2fff38a8c93a7606 (diff) | |
| parent | 8279c9423d1e2166db04c256e3b475583537888b (diff) | |
| download | openshift-4c6290bba977fea444c1758d74610c9dbf73be4e.tar.gz openshift-4c6290bba977fea444c1758d74610c9dbf73be4e.tar.bz2 openshift-4c6290bba977fea444c1758d74610c9dbf73be4e.tar.xz openshift-4c6290bba977fea444c1758d74610c9dbf73be4e.zip | |
Merge pull request #1598 from kwoodson/metafix
Updates for metadata tooling to work without env.
Diffstat (limited to 'bin/openshift_ansible')
| -rw-r--r-- | bin/openshift_ansible/awsutil.py | 10 |
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 |