kitchen-openstack 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d66ce0ff71e2179911c7fa1b6537621df9807ac0
-  data.tar.gz: d1c8922782d6c668225bb025bbbadb49db017c89
+  metadata.gz: 84ee970244371b0d525d62e3de2683562249fc49
+  data.tar.gz: 9fbd1af6fc48fa29385f04c851d92e3ac91aabf0
 SHA512:
-  metadata.gz: 4938e5b6b9ee42907c96afdb8440699c85dc61d8572d92371d40a1497a8bbe333502277bb9836e3b5b11a59ea0ea130b4ebc8230d0442d475abbb2bd3293e5af
-  data.tar.gz: 6dcd850d52c56601b4b77426cd45fdb7afc23992f0cd0a049cfd4886f2a648df5ae35aa420c0ddcdedc291bf380f81fd5cd0778ce8139022257c11ed3b7d3708
+  metadata.gz: 480bf5ffa70f5eab36da5c14d4b32a9ae2c841c893af0cda92268bfe193ba35dfc841e12f647791e8da1b88c17484ce806d66b8a9046d17a70ffedf30ce9bd44
+  data.tar.gz: bc296c784c1c1fe36394cd7de4ca636a6f00c350530e677039725133096c9b764d7e45a8fd0cccf3fc3d7a05266f866a0de72def187d5ed797fecf82ef4386be

data/CHANGELOG.md

@@ -1,7 +1,22 @@
 # Change Log
 
-## [v3.3.0](https://github.com/test-kitchen/kitchen-openstack/tree/v3.3.0)
+## [Unreleased](https://github.com/test-kitchen/kitchen-openstack/tree/v3.4.0)
 
+[Full Changelog](https://github.com/test-kitchen/kitchen-openstack/compare/v3.3.0...v3.4.0)
+
+**Closed issues:**
+
+- Multiple networks in network\_id causes error [\#163](https://github.com/test-kitchen/kitchen-openstack/issues/163)
+- Can't create VM [\#160](https://github.com/test-kitchen/kitchen-openstack/issues/160)
+- Why is private\_key\_path required? [\#151](https://github.com/test-kitchen/kitchen-openstack/issues/151)
+- version 3.1.0 does not properly wait for VM to be up before failing [\#147](https://github.com/test-kitchen/kitchen-openstack/issues/147)
+
+**Merged pull requests:**
+
+- Fix creation of floating IP to use network ID instead of name [\#162](https://github.com/test-kitchen/kitchen-openstack/pull/162) ([dannytrigo](https://github.com/dannytrigo))
+- Updated readme with clarity [\#161](https://github.com/test-kitchen/kitchen-openstack/pull/161) ([jjasghar](https://github.com/jjasghar))
+
+## [v3.3.0](https://github.com/test-kitchen/kitchen-openstack/tree/v3.3.0) (2017-03-13)
 [Full Changelog](https://github.com/test-kitchen/kitchen-openstack/compare/v3.2.0...v3.3.0)
 
 **Merged pull requests:**

data/README.md

@@ -49,7 +49,7 @@ driver:
   name: openstack
   openstack_username: [YOUR OPENSTACK USERNAME]
   openstack_api_key: [YOUR OPENSTACK API KEY] # AKA your OpenStack Password
-  openstack_auth_url: [YOUR OPENSTACK AUTH URL]
+  openstack_auth_url: [YOUR OPENSTACK AUTH URL] # if you are using v3, API_URL/v3/auth/tokens
   require_chef_omnibus: [e.g. 'true' or a version number if you need Chef]
   image_ref: [SERVER IMAGE ID]
   flavor_ref: [SERVER FLAVOR ID]
@@ -79,7 +79,7 @@ All of Fog's `openstack` options (`openstack_domain_name`, `openstack_project_na
 
 ### openstack\_auth\_url
 
-**Required** Your OpenStack auth url.
+**Required** Your OpenStack auth url. If you are using ID v3, you'll need to use `API_URL/v3/auth/tokens`.
 
 ### require\_chef_omnibus
 
@@ -93,7 +93,7 @@ All of Fog's `openstack` options (`openstack_domain_name`, `openstack_project_na
 
 **image_ref or image_id required** Server Image ID.  Specifying the ID instead of reference results in a faster create time.
 
-**Note** If the image UUID changes this value will need to be updated. 
+**Note** If the image UUID changes this value will need to be updated.
 
 ### flavor\_ref
 
@@ -214,7 +214,7 @@ network_ref:
 
 A list of network ids to create instances with.  Specifying the id instead of reference results in a faster create time.
 
-**Note** If the network UUID changes this value will need to be updated. 
+**Note** If the network UUID changes this value will need to be updated.
 
 ```yaml
 network_ref:
@@ -339,7 +339,7 @@ assuming that test network is configured as private.
 ### use_ipv6
 
 If true use IPv6 addresses to for SSH connections. If false, the default, use
-IPv4 addresses for SSH connections. 
+IPv4 addresses for SSH connections.
 
 ### network\_ref
 

data/lib/kitchen/driver/openstack.rb

@@ -109,11 +109,17 @@ module Kitchen
 
         unless server.nil?
           if config[:floating_ip_pool] && config[:allocate_floating_ip]
-            ip = get_ip(server)
-            floating_ip_id = network.list_floating_ips(floating_ip_address: ip)
-                                    .body['floatingips'][0]['id']
-            network.delete_floating_ip(floating_ip_id)
-            info "OpenStack Floating IP <#{ip}> released."
+            info 'Retrieve the floating IP'
+            pub, priv = get_public_private_ips(server)
+            pub, = parse_ips(pub, priv)
+            pub_ip = pub[config[:public_ip_order].to_i] || nil
+            if pub_ip
+              info "Retrieve the ID of floating IP <#{pub_ip}>"
+              floating_ip_id = network.list_floating_ips(floating_ip_address: pub_ip) # rubocop:disable Metrics/LineLength
+                                      .body['floatingips'][0]['id']
+              network.delete_floating_ip(floating_ip_id)
+              info "OpenStack Floating IP <#{pub_ip}> released."
+            end
           end
           server.destroy
         end
@@ -289,9 +295,11 @@ module Kitchen
         @@ip_pool_lock.synchronize do
           info "Attaching floating IP from <#{pool}> pool"
           if config[:allocate_floating_ip]
-            resp = network.create_floating_ip(pool)
+            network_id = network.list_networks(name: pool)
+                                .body['networks'][0]['id']
+            resp = network.create_floating_ip(network_id)
             ip = resp.body['floatingip']['floating_ip_address']
-            info "Attaching floating IP from <#{pool}> pool"
+            info "Created floating IP <#{ip}> from <#{pool}> pool"
             config[:floating_ip] = ip
           else
             free_addrs = compute.addresses.map do |i|

data/lib/kitchen/driver/openstack_version.rb

@@ -22,6 +22,6 @@ module Kitchen
   #
   # @author Jonathan Hartman <j@p4nt5.com>
   module Driver
-    OPENSTACK_VERSION = '3.3.0'.freeze
+    OPENSTACK_VERSION = '3.4.0'.freeze
   end
 end

data/spec/kitchen/driver/openstack_spec.rb

@@ -293,7 +293,7 @@ describe Kitchen::Driver::Openstack do
 
       let(:driver) do
         d = super()
-        allow(d).to receive(:get_ip).and_return(ip)
+        allow(d).to receive(:get_public_private_ips).and_return([ip, nil])
         allow(d).to receive(:compute).and_return(compute)
         allow(d).to receive(:network).and_return(network)
         d
@@ -952,14 +952,18 @@ describe Kitchen::Driver::Openstack do
     let(:server) { nil }
     let(:pool) { 'swimmers' }
     let(:config) { { allocate_floating_ip: true } }
+    let(:network_id) { 123 }
     let(:ip) { '1.1.1.1' }
     let(:address) do
       double(ip: ip, fixed_ip: nil, instance_id: nil, pool: pool)
     end
-    let(:network_response) do
+    let(:list_networks_response) do
+      double(body: { 'networks' => [{ 'name' => pool, 'id' => network_id }] })
+    end
+    let(:create_ip_network_response) do
       double(body: { 'floatingip' => { 'floating_ip_address' => ip } })
     end
-    let(:network) { double(create_floating_ip: network_response) }
+    let(:network) { double(list_networks: list_networks_response, create_floating_ip: create_ip_network_response) } # rubocop:disable Metrics/LineLength
 
     before(:each) do
       allow(driver).to receive(:attach_ip).with(server, ip).and_return('bing!')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Jonathan Hartman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen