summaryrefslogtreecommitdiffstats
path: root/bin/openshift_ansible/awsutil.py
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-11-30 17:33:03 -0500
committerKenny Woodson <kwoodson@redhat.com>2015-12-11 12:30:39 -0500
commit7c945d07d2a61e7334a10388d37ac28f1bc58ce1 (patch)
treed6a1c77f875ed11634aef0f79f476c2a5c7fa37c /bin/openshift_ansible/awsutil.py
parent5ad87a4592167142ec23058385b9bb96b594a12b (diff)
downloadopenshift-7c945d07d2a61e7334a10388d37ac28f1bc58ce1.tar.gz
openshift-7c945d07d2a61e7334a10388d37ac28f1bc58ce1.tar.bz2
openshift-7c945d07d2a61e7334a10388d37ac28f1bc58ce1.tar.xz
openshift-7c945d07d2a61e7334a10388d37ac28f1bc58ce1.zip
Updating env-host-type to host patterns
Diffstat (limited to 'bin/openshift_ansible/awsutil.py')
-rw-r--r--bin/openshift_ansible/awsutil.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/openshift_ansible/awsutil.py b/bin/openshift_ansible/awsutil.py
index 45345007c..ba32b4dbd 100644
--- a/bin/openshift_ansible/awsutil.py
+++ b/bin/openshift_ansible/awsutil.py
@@ -58,7 +58,7 @@ class AwsUtil(object):
def get_environments(self):
"""Searches for env tags in the inventory and returns all of the envs found."""
- pattern = re.compile(r'^tag_environment_(.*)')
+ pattern = re.compile(r'^tag_env_(.*)')
envs = []
inv = self.get_inventory()
@@ -106,13 +106,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 'ec2_tag_env' not in host:
continue
- if host['ec2_tag_environment'] not in inst_by_env:
- inst_by_env[host['ec2_tag_environment']] = {}
+ if host['ec2_tag_env'] not in inst_by_env:
+ inst_by_env[host['ec2_tag_env']] = {}
host_id = "%s:%s" % (host['ec2_tag_Name'], host['ec2_id'])
- inst_by_env[host['ec2_tag_environment']][host_id] = host
+ inst_by_env[host['ec2_tag_env']][host_id] = host
return inst_by_env
@@ -154,7 +154,7 @@ class AwsUtil(object):
def gen_env_tag(env):
"""Generate the environment tag
"""
- return "tag_environment_%s" % env
+ return "tag_env_%s" % env
def gen_host_type_tag(self, host_type):
"""Generate the host type tag