opsmgr 0.34.16 → 0.34.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5832215c2a77af0680898189552f1e4dbb1be7c
-  data.tar.gz: 8a22c9379f07c6fd551048d93d8822e966fce9b7
+  metadata.gz: 8f1d8c27e3a445cb069e3504e40eda270fbcff60
+  data.tar.gz: c620fdb0116604ea67cff20f91fcde94e94f6968
 SHA512:
-  metadata.gz: 5c929ca0a27c4ded1274f2ec2f094c111fcb5a535bf2ec9a15655adbb2becb9ce5a5cca84560e1b0e277c71152dda680441cab6c05dff287269cc36a576196ff
-  data.tar.gz: 1438dc49b2e21e7697c015a55145919056b06884a83b4935ac0974d296f0a038722764031c42ff0f54a8e5aca1d85f83078828eb3202d25bfebb05af338c47ea
+  metadata.gz: 8deb15863ca4610bb90a407e2a440b18411096c4bb1e561db5dbb358154ca4521a1f36efd5115cdd87753013008c9a00eb3d16a54fb0017afdbd9cd5b50c794f
+  data.tar.gz: cec83e78da4e427d7881905633b40fe9f1d55f448e400afd0726d935b0195840c33a2f3f973d28f181daf87d74e693e0ae526ec64242d876bc77d0fa7b61c859

data/lib/opsmgr/api/results.rb

@@ -102,9 +102,24 @@ module Opsmgr
       end
 
       def director_ip
-        ips = microbosh_settings.fetch('ips')
-        _, director_ips = ips.each_pair.find { |ip_key, _| ip_key =~ /^director-/ }
-        director_ips.first
+        ips_for_job(product_name: 'p-bosh', job_name: 'director').first ||
+          ips_for_job(product_name: 'microbosh', job_name: 'director').first
+      end
+
+      def ips_for_job(product_name:, job_name:)
+        product = products.find { |p| p.name == product_name }
+        return [] if product.nil?
+
+        if install_hash['ip_assignments']
+          install_hash['ip_assignments']['assignments'][product['guid']].each do |job_guid, assignment|
+            return assignment.values.flatten if job_guid.starts_with?(job_name)
+          end
+        else
+          product.fetch('ips').each do |job_guid, ips|
+            return ips if job_guid.starts_with?(job_name)
+          end
+        end
+        []
       end
 
       def director_password
@@ -166,7 +181,7 @@ module Opsmgr
       attr_reader :install_hash
 
       def microbosh_settings
-        products.find { |product| product.name == 'microbosh' } || fail('microbosh not found')
+        products.find { |product| product.name == 'p-bosh' || product.name == 'microbosh' } || fail('microbosh not found')
       end
 
       def cf_settings

data/lib/opsmgr/version.rb

@@ -1,5 +1,5 @@
 module Opsmgr
-  VERSION = '0.34.16'.freeze
+  VERSION = '0.34.17'.freeze
 end
 # Copyright (c) 2014-2015 Pivotal Software, Inc.
 # All rights reserved.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsmgr
 version: !ruby/object:Gem::Version
-  version: 0.34.16
+  version: 0.34.17
 platform: ruby
 authors:
 - Release Engineering
@@ -378,7 +378,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="