summaryrefslogtreecommitdiffstats
path: root/lib/aws_helper.rb
diff options
context:
space:
mode:
authorThomas Wiest <twiest@gmail.com>2014-10-23 16:27:39 -0400
committerThomas Wiest <twiest@gmail.com>2014-10-23 16:27:39 -0400
commitd8a336f0e86dbe2a933c805c75b8bcc11b67cf8a (patch)
tree44ba1eb9aef8cb65b3c47dec2bf4c41d70e25c76 /lib/aws_helper.rb
parentcde5cba28b7b0e9386f1c549ecf9141bbcadc64e (diff)
parent6878f8690843e3f4b4c68f464bb39dd682bf51f4 (diff)
downloadopenshift-d8a336f0e86dbe2a933c805c75b8bcc11b67cf8a.tar.gz
openshift-d8a336f0e86dbe2a933c805c75b8bcc11b67cf8a.tar.bz2
openshift-d8a336f0e86dbe2a933c805c75b8bcc11b67cf8a.tar.xz
openshift-d8a336f0e86dbe2a933c805c75b8bcc11b67cf8a.zip
Merge pull request #12 from twiest/pull
made aws list display more information, and be able to only show a single environment
Diffstat (limited to 'lib/aws_helper.rb')
-rw-r--r--lib/aws_helper.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/aws_helper.rb b/lib/aws_helper.rb
index 6d213107b..053f5267e 100644
--- a/lib/aws_helper.rb
+++ b/lib/aws_helper.rb
@@ -21,12 +21,14 @@ module OpenShift
retval << OpenStruct.new({
:name => info['ec2_tag_Name'],
:env => info['ec2_tag_environment'] || 'UNSET',
- :external_ip => info['ec2_ip_address'],
- :public_dns => info['ec2_public_dns_name']
+ :public_ip => info['ec2_ip_address'],
+ :public_dns => info['ec2_public_dns_name'],
+ :state => info['ec2_state'],
+ :created_by => info['ec2_tag_created-by']
})
end
- retval.sort_by! { |h| [h.env, h.name] }
+ retval.sort_by! { |h| [h.env, h.state, h.name] }
return retval
end