summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-03-03 15:48:48 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2015-03-03 15:48:48 -0500
commit6a4398ec92aeca95a6d3387c3080615fedefcf19 (patch)
tree3a52a54b80ccb94f6490cf00f9179d97ca53f40c /lib
parentfed63a0aeb5a90cf1894a3cd6a1db7d3321ad8eb (diff)
parentacae2c362de0eae076187b71cf39ded6c8fc1d1c (diff)
downloadopenshift-6a4398ec92aeca95a6d3387c3080615fedefcf19.tar.gz
openshift-6a4398ec92aeca95a6d3387c3080615fedefcf19.tar.bz2
openshift-6a4398ec92aeca95a6d3387c3080615fedefcf19.tar.xz
openshift-6a4398ec92aeca95a6d3387c3080615fedefcf19.zip
Merge pull request #73 from lhuard1A/fix_aws_cluster_list
Fix './cluster.sh list' on AWS when some VMs have no name
Diffstat (limited to 'lib')
-rw-r--r--lib/aws_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/aws_helper.rb b/lib/aws_helper.rb
index 2e90ba148..4da5d0925 100644
--- a/lib/aws_helper.rb
+++ b/lib/aws_helper.rb
@@ -19,7 +19,7 @@ module OpenShift
retval = []
hosts['_meta']['hostvars'].each do |host, info|
retval << OpenStruct.new({
- :name => info['ec2_tag_Name'],
+ :name => info['ec2_tag_Name'] || 'UNSET',
:env => info['ec2_tag_environment'] || 'UNSET',
:public_ip => info['ec2_ip_address'],
:public_dns => info['ec2_public_dns_name'],