From 8bb0c7f24b4bafec77d6988639ae9f56396bf1a4 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Fri, 13 Feb 2015 15:10:29 -0500
Subject: Fixing tag name to prepend aws identifier.
---
lib/aws_command.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'lib/aws_command.rb')
diff --git a/lib/aws_command.rb b/lib/aws_command.rb
index 1c3efc91c..2119630cf 100644
--- a/lib/aws_command.rb
+++ b/lib/aws_command.rb
@@ -78,7 +78,7 @@ module OpenShift
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']
+ 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}']"
--
cgit v1.2.3
From 1bbb46d608b8315830b4ffd4f853cf6e2215d994 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Fri, 13 Feb 2015 15:43:10 -0500
Subject: Fixed a couple of other variables that were incorrect.
---
lib/aws_command.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'lib/aws_command.rb')
diff --git a/lib/aws_command.rb b/lib/aws_command.rb
index 2119630cf..5cbb7871b 100644
--- a/lib/aws_command.rb
+++ b/lib/aws_command.rb
@@ -76,8 +76,8 @@ 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']
+ 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])
--
cgit v1.2.3