summaryrefslogtreecommitdiffstats
path: root/lib/gce_helper.rb
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-02-19 15:34:30 -0500
committerKenny Woodson <kwoodson@redhat.com>2015-02-19 15:34:30 -0500
commitff402ef719a74a76407fef2569a11ee85dfb1093 (patch)
tree0b1a8bf82bbbd0cc6c464b6aa2723cf1a2abbfe9 /lib/gce_helper.rb
parent81db3db61f911cbbc6ff8f88b90cecb870c41381 (diff)
parentb3507fa9b3e03f431c5de00a10137ddcf354593e (diff)
downloadopenshift-ff402ef719a74a76407fef2569a11ee85dfb1093.tar.gz
openshift-ff402ef719a74a76407fef2569a11ee85dfb1093.tar.bz2
openshift-ff402ef719a74a76407fef2569a11ee85dfb1093.tar.xz
openshift-ff402ef719a74a76407fef2569a11ee85dfb1093.zip
Merge pull request #68 from kwoodson/gce_helper_fix
Fix for the latest changes to gce list. Now correctly using _meta and host vars.
Diffstat (limited to 'lib/gce_helper.rb')
-rw-r--r--lib/gce_helper.rb32
1 files changed, 25 insertions, 7 deletions
diff --git a/lib/gce_helper.rb b/lib/gce_helper.rb
index 2ff716ce1..19fa00020 100644
--- a/lib/gce_helper.rb
+++ b/lib/gce_helper.rb
@@ -5,23 +5,41 @@ module OpenShift
class GceHelper
MYDIR = File.expand_path(File.dirname(__FILE__))
- def self.get_hosts()
+ def self.get_list()
cmd = "#{MYDIR}/../inventory/gce/gce.py --list"
hosts = %x[#{cmd} 2>&1]
raise "Error: failed to list hosts\n#{hosts}" unless $?.exitstatus == 0
- # invert the hash so that it's key is the host, and values is an array of metadata
- data = {}
- JSON.parse(hosts).each do |key,value|
- value.each { |h| (data[h] ||= []) << key }
+ return JSON.parse(hosts)
+ end
+
+ def self.get_tag(tags, selector)
+ tags.each do |tag|
+ return $1 if tag =~ selector
end
- # For now, we only care about the name. In the future, we may want the other metadata included.
+ return nil
+ end
+
+ def self.get_hosts()
+ hosts = get_list()
+
retval = []
- data.keys.sort.each { |k| retval << OpenStruct.new({ :name => k }) }
+ hosts['_meta']['hostvars'].each do |host, info|
+ retval << OpenStruct.new({
+ :name => info['gce_name'],
+ :env => get_tag(info['gce_tags'], /^env-(\w+)$/) || 'UNSET',
+ :public_ip => info['gce_public_ip'],
+ :state => info['gce_status'],
+ :created_by => get_tag(info['gce_tags'], /^created-by-(\w+)$/) || 'UNSET',
+ })
+ end
+
+ retval.sort_by! { |h| [h.env, h.state, h.name] }
return retval
+
end
def self.get_host_details(host)