summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-02-16 12:31:51 -0500
committerKenny Woodson <kwoodson@redhat.com>2015-02-16 12:31:51 -0500
commit9fed3621012fa21e87e46c704904895bf26cfa1f (patch)
tree8d7865219b17cf5224a400050458ef5b2cb6d019
parent2a179f6cdfb7ae39ab8dc9605418310da4dc4271 (diff)
parent1bbb46d608b8315830b4ffd4f853cf6e2215d994 (diff)
downloadopenshift-9fed3621012fa21e87e46c704904895bf26cfa1f.tar.gz
openshift-9fed3621012fa21e87e46c704904895bf26cfa1f.tar.bz2
openshift-9fed3621012fa21e87e46c704904895bf26cfa1f.tar.xz
openshift-9fed3621012fa21e87e46c704904895bf26cfa1f.zip
Merge pull request #60 from kwoodson/host_type_fix
Fixed issue where --name was insufficient to apply config.
-rw-r--r--lib/aws_command.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/aws_command.rb b/lib/aws_command.rb
index 1c3efc91c..5cbb7871b 100644
--- a/lib/aws_command.rb
+++ b/lib/aws_command.rb
@@ -76,9 +76,9 @@ module OpenShift
host_type = nil
if options[:name]
details = AwsHelper.get_host_details(options[:name])
- ah.extra_vars['oo_host_group_exp'] = options[:name]
- ah.extra_vars['oo_env'] = details['env']
- host_type = details['host-type']
+ ah.extra_vars['oo_host_group_exp'] = details['ec2_public_dns_name']
+ ah.extra_vars['oo_env'] = details['ec2_tag_environment']
+ host_type = details['ec2_tag_host-type']
elsif options[:type] && options[:env]
oo_env_host_type_tag = AwsHelper.generate_env_host_type_tag_name(options[:env], options[:type])
ah.extra_vars['oo_host_group_exp'] = "groups['#{oo_env_host_type_tag}']"