diff options
| author | Matt Woodson <mwoodson@redhat.com> | 2015-02-16 15:47:37 -0500 |
|---|---|---|
| committer | Matt Woodson <mwoodson@redhat.com> | 2015-02-16 15:47:37 -0500 |
| commit | 57e489934ab7d6d895f7e4df1def3f9170773fa1 (patch) | |
| tree | 2493215f84f3b47c743cc9695b80f1889d4050c1 /lib | |
| parent | 6f4ccff8954b57156a4df2984c953debfeef7c2d (diff) | |
| parent | 9fed3621012fa21e87e46c704904895bf26cfa1f (diff) | |
| download | openshift-57e489934ab7d6d895f7e4df1def3f9170773fa1.tar.gz openshift-57e489934ab7d6d895f7e4df1def3f9170773fa1.tar.bz2 openshift-57e489934ab7d6d895f7e4df1def3f9170773fa1.tar.xz openshift-57e489934ab7d6d895f7e4df1def3f9170773fa1.zip | |
Merge branch 'master' into tower_install
Conflicts:
lib/aws_command.rb
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/aws_command.rb | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/aws_command.rb b/lib/aws_command.rb index 109542007..06a65aac1 100644 --- a/lib/aws_command.rb +++ b/lib/aws_command.rb @@ -76,16 +76,7 @@ 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'] - -# ah.extra_vars['oo_host_group_exp'] = details['ec2_public_dns_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] |