rouster 0.69 → 0.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b0d2cb460b4d6fad86880726845308f77c14cf8
-  data.tar.gz: 66319f2e227a7bbb4d51458ca3f6628ef281ddf0
+  metadata.gz: afc35059dfd069465564f8bfc05e73691eeae808
+  data.tar.gz: 7bdf52d6fbc039e0eeedb7082c074554af63ecbb
 SHA512:
-  metadata.gz: c6854485af207e64f012b3d45a79e9f90844cf403b0dfbfa41915b6832e9678004e0b6d5b98fd6bdd6dd73da802de36490e7d06715a704d8a34c701b8428f1d2
-  data.tar.gz: 93b7c1a6577ced94ed8cc9bd31341ee90af333aa4a8759c73a5b418ef1281b548326640d1f1cb81ab47c4c777719d670cdb03314fad38d33fedf0bf5be9476b5
+  metadata.gz: eff286e080ac8cfaf0cbcdc23c5488ec879860f613cf01009dd5b1d24cd02c918c9fb54f705e863bfdfb948bcdbb84b717099915de4e89b54524c9fe002a5556
+  data.tar.gz: eddbbc417d46c8e1fb8235a188170f3d2599f4eb0f43bae13ab1746e15b155314a15f8531199b9867955f3df052dfbfa9c2cc8e53cd474694a4724c131234e2d

data/lib/rouster.rb

@@ -12,7 +12,7 @@ require 'rouster/vagrant'
 class Rouster
 
   # sporadically updated version number
-  VERSION = 0.69
+  VERSION = 0.71
 
   # custom exceptions -- what else do we want them to include/do?
   class ArgumentError        < StandardError; end # thrown by methods that take parameters from users
@@ -212,7 +212,12 @@ class Rouster
           @logger.debug(':instance specified, will connect to existing OpenStack instance')
           inst_details = self.ostack_describe_instance(@passthrough[:instance])
           raise ArgumentError.new(sprintf('No such instance found in OpenStack - %s', @passthrough[:instance])) if inst_details.nil?
-          @passthrough[:host] = inst_details.addresses["NextGen"][0]["addr"]
+          inst_details.addresses.each_key do |address_key|
+            if defined?(inst_details.addresses[address_key].first['addr'])
+              @passthrough[:host] = inst_details.addresses[address_key].first['addr']
+              break
+            end
+          end
         end
       else
         raise ArgumentError.new(sprintf('passthrough :type [%s] unknown, allowed: :aws, :openstack, :local, :remote', @passthrough[:type]))

data/plugins/openstack.rb

@@ -40,13 +40,10 @@ class Rouster
                   :image_ref => @passthrough[:image_ref], :key_name => @passthrough[:keypair], :user_data => @passthrough[:user_data])
       server.wait_for { ready? }
       @instance_data = server
-      if defined?(self.addresses['NextGen'][0]['addr'])
-        self.passthrough[:host] = self.addresses['NextGen'][0]['addr']
-      else
-        server.addresses.each_key do |address_key|
-          if defined?(server.addresses[address_key])
-            self.passthrough[:host] = server.addresses[address_key][0]['addr']
-          end
+      server.addresses.each_key do |address_key|
+        if defined?(server.addresses[address_key])
+          self.passthrough[:host] = server.addresses[address_key].first['addr']
+          break
         end
       end
       self.passthrough[:instance] = self.ostack_get_instance_id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouster
 version: !ruby/object:Gem::Version
-  version: '0.69'
+  version: '0.71'
 platform: ruby
 authors:
 - Conor Horan-Kates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json