kitchen-openstack 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23c44843c2f545b10ef08c9a7e798afff8acd4e3
-  data.tar.gz: 88bb1823d40b4929fef0de8d05a62ade24909d1c
+  metadata.gz: d61046f3b469a583ba70e208458891c7776d2e84
+  data.tar.gz: 39dd8f696144547472cf9e36add6d30c1272d57c
 SHA512:
-  metadata.gz: cc92ccbd2840b79694c06fbbf9b631d5067ae7268b8c5f01b2739ff0cd7441eeba405d227b919f5048749ec253286adcbab5ff28e89c645418b5fe54ef10af04
-  data.tar.gz: bb10f75c4b1751658486c274f4a398fdd59baa2bfa77a1c7a3d4fbc4617003f7186c9abfb94ff84c2d48e0bc05f232ce1c921db8e4425f8e0a68798919bc12ca
+  metadata.gz: 90b0fd6ce3270b2ca24c3aab4a69a64a2ddcf2cacf6ce54e0efab379cb725077df0ed7881ed839714f411e8f19bdd054bef4aacda34df8e6f46711b630161aa1
+  data.tar.gz: 9252addff3911915eb6447881089541b1eef64ce5cbc5e173ae10d29fe50f2fdbcbd06d1dec6202ce44c8754572b02ec92fe792f118ea132e02a5c958a8d4bda

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.4.0 / 2014-04-09
+
+### Improvements
+
+* PR [#46][] - Use a configured floating IP for SSH; via [@dschlenk][]
+
 # 1.3.0 / 2014-03-09
 
 ### New Features
@@ -81,6 +87,7 @@ certain specified NICs; via [@monsterzz][]
 
 * Initial release! Woo!
 
+[#46]: https://github.com/test-kitchen/kitchen-openstack/pull/46
 [#41]: https://github.com/test-kitchen/kitchen-openstack/pull/41
 [#40]: https://github.com/test-kitchen/kitchen-openstack/pull/40
 [#39]: https://github.com/test-kitchen/kitchen-openstack/pull/39
@@ -100,6 +107,7 @@ certain specified NICs; via [@monsterzz][]
 [#7]: https://github.com/test-kitchen/kitchen-openstack/pull/7
 [#2]: https://github.com/test-kitchen/kitchen-openstack/pull/2
 
+[@dschlenk]: https://github.com/dschlenk
 [@wilreichert]: https://github.com/wilreichert
 [@tenforward]: https://github.com/tenforward
 [@monsterzz]: https://github.com/monsterzz

data/README.md

@@ -55,8 +55,6 @@ behavior can be overridden with additional options:
     openstack_region: [A VALID OPENSTACK REGION]
     openstack_service_name: [YOUR OPENSTACK COMPUTE SERVICE NAME]
     openstack_network_name: [YOUR OPENSTACK NETWORK NAME USED TO CONNECT]
-    floating_ip: [A SPECIFIC FLOATING IP TO ASSIGN]
-    floating_ip_pool: [AN OPENSTACK POOL NAME TO ASSIGN THE NEXT IP FROM]
     security_groups:
       - [A LIST OF...]
       - [...SECURITY GROUPS TO JOIN]
@@ -71,6 +69,13 @@ If a `key_name` is provided without any `private_key_path`, unexpected
 behavior may result if your local RSA/DSA private key doesn't match that
 OpenStack key.
 
+A specific `floating_ip` or the ID of a `floating_ip_pool` can be provided to
+bind a floating IP to the node. Any floating IP will be the IP used for
+Test Kitchen's SSH calls to the node.
+
+    floating_ip: [A SPECIFIC FLOATING IP TO ASSIGN]
+    floating_ip_pool: [AN OPENSTACK POOL NAME TO ASSIGN THE NEXT IP FROM]
+
 The `network_ref` option can be specified as an exact id, an exact name,
 or as a regular expression matching the name of the network. You can pass one
 

data/lib/kitchen/driver/openstack.rb

@@ -218,6 +218,7 @@ module Kitchen
           if free_addrs.empty?
             raise ActionFailed, "No available IPs in pool <#{pool}>"
           end
+          config[:floating_ip] = free_addrs[0]
           attach_ip(server, free_addrs[0])
         end
       end
@@ -229,6 +230,10 @@ module Kitchen
       end
 
       def get_ip(server)
+        unless config[:floating_ip].nil?
+          debug "Using floating ip: #{config[:floating_ip]}"
+          return config[:floating_ip]
+        end
         if config[:openstack_network_name]
           debug "Using configured net: #{config[:openstack_network_name]}"
           return server.addresses[config[:openstack_network_name]].first['addr']

data/lib/kitchen/driver/openstack_version.rb

@@ -19,7 +19,7 @@
 module Kitchen
   module Driver
     # Version string for OpenStack Kitchen driver
-    OPENSTACK_VERSION = '1.3.0'
+    OPENSTACK_VERSION = '1.4.0'
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jonathan Hartman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen