kitchen-openstack 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9507fa7ef6e5992264a1c247afd51d101a4900d
-  data.tar.gz: 89250f568fd53af7606ac13b80b51207c8ced09c
+  metadata.gz: 0b45b8838c9ce9a545a07a8901639a6eb32ddd42
+  data.tar.gz: 7f1064f7e1b13a831174e2b04c8545f4f22eb4ee
 SHA512:
-  metadata.gz: 3f9042d9819e7ded25c59456be4dc786e72565f8ffe1021dc82411c2684d2f6abe5e97c5c1efdef593c435a27182e5b5d6f739dda8234ce2790c57a43e1ef089
-  data.tar.gz: 21fd4880c2a0fe69b288da4b39ca04b76018fef140f41aed4e30b0222b8bbe615401e8ae65e53eedcab4b8d4d5deec24386bc0481f5b18f309a7649fa7997f7a
+  metadata.gz: 4668a5ee747b461c5cf2402f136e82fec77b76e7a43836bd8987c0f3b1054caaaf2e860dd4c3c4776f17e85677220a56a9194d3387b800e6a0e866dd71cfea7a
+  data.tar.gz: d680ce65e0b59b420afa1375c8c290d50d6141dfdea5bfee781de7e4cd9c89cf4d8adfbd6a18471cf58f7ce4dda32e641258594a3839e821af6fc140e945bc8a

data/CHANGELOG.md

@@ -1,11 +1,25 @@
 # Change Log
 
-## [v3.0.0](https://github.com/test-kitchen/kitchen-openstack/tree/v3.0.0) (2016-02-24)
+## [v3.1.0](https://github.com/test-kitchen/kitchen-openstack/tree/v3.1.0)
+
+[Full Changelog](https://github.com/test-kitchen/kitchen-openstack/compare/v3.0.0...v3.1.0)
+
+**Closed issues:**
+
+- `use\_ipv6` setting not respected when using `openstack\_network\_name` [\#141](https://github.com/test-kitchen/kitchen-openstack/issues/141)
 
+**Merged pull requests:**
+
+- Add config drive [\#144](https://github.com/test-kitchen/kitchen-openstack/pull/144) ([bradkwadsworth](https://github.com/bradkwadsworth))
+- Update to check IP version when using `openstack\_network\_name`. [\#142](https://github.com/test-kitchen/kitchen-openstack/pull/142) ([nmische](https://github.com/nmische))
+- minor grammar tweak to sleep message [\#140](https://github.com/test-kitchen/kitchen-openstack/pull/140) ([dpetzel](https://github.com/dpetzel))
+
+## [v3.0.0](https://github.com/test-kitchen/kitchen-openstack/tree/v3.0.0) (2016-02-24)
 [Full Changelog](https://github.com/test-kitchen/kitchen-openstack/compare/v3.0.0.pre.1...v3.0.0)
 
 **Merged pull requests:**
 
+- 3.0.0 prep work [\#139](https://github.com/test-kitchen/kitchen-openstack/pull/139) ([jjasghar](https://github.com/jjasghar))
 - 3.0.0 Release of kitchen-openstack [\#136](https://github.com/test-kitchen/kitchen-openstack/pull/136) ([jjasghar](https://github.com/jjasghar))
 
 ## [v3.0.0.pre.1](https://github.com/test-kitchen/kitchen-openstack/tree/v3.0.0.pre.1) (2016-02-12)

data/README.md

@@ -197,6 +197,14 @@ for example:
 echo "do whatever you want to pre-configure your machine"
 ```
 
+### config\_drive
+
+If your vms require config drive.
+
+```
+    config_drive: true
+```
+
 ### network\_ref
 
 **Deprecated** A list of network names or ids to create instances with.
@@ -306,6 +314,10 @@ to use second `10.0.1.1` IP address you need to specify
 ```
 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. 
 
 ### network\_ref
 

data/kitchen-openstack.gemspec

@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'simplecov-console'
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'github_changelog_generator'
 end

data/lib/kitchen/driver/openstack.rb

@@ -179,7 +179,8 @@ module Kitchen
           :security_groups,
           :public_key_path,
           :key_name,
-          :user_data
+          :user_data,
+          :config_drive
         ].each do |c|
           server_def[c] = optional_config(c) if config[c]
         end
@@ -324,7 +325,8 @@ module Kitchen
         # should also work for private networks
         if config[:openstack_network_name]
           debug "Using configured net: #{config[:openstack_network_name]}"
-          return server.addresses[config[:openstack_network_name]].first['addr']
+          return filter_ips(server.addresses[config[:openstack_network_name]])
+                 .first['addr']
         end
 
         pub, priv = get_public_private_ips(server)
@@ -335,6 +337,14 @@ module Kitchen
           fail(ActionFailed, 'Could not find an IP') # rubocop:disable Metrics/LineLength, SignalException
       end
 
+      def filter_ips(addresses)
+        if config[:use_ipv6]
+          return addresses.select { |i| IPAddr.new(i['addr']).ipv6? }
+        else
+          return addresses.select { |i| IPAddr.new(i['addr']).ipv4? }
+        end
+      end
+
       def parse_ips(pub, priv)
         pub = Array(pub)
         priv = Array(priv)
@@ -375,7 +385,7 @@ module Kitchen
 
       def wait_for_server(state)
         if config[:server_wait]
-          info "Sleeping for #{config[:server_wait]} seconds to let your server to start up..." # rubocop:disable Metrics/LineLength
+          info "Sleeping for #{config[:server_wait]} seconds to let your server start up..." # rubocop:disable Metrics/LineLength
           countdown(config[:server_wait])
         end
         info 'Waiting for server to be ready...'

data/lib/kitchen/driver/openstack_version.rb

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

data/spec/kitchen/driver/openstack_spec.rb

@@ -713,7 +713,32 @@ describe Kitchen::Driver::Openstack do
           flavor_ref: '1',
           availability_zone: nil,
           public_key_path: 'tarpals',
-          user_data: data)
+          user_data: data
+        )
+        driver.send(:create_server)
+      end
+    end
+
+    context 'config drive enabled' do
+      let(:config) do
+        {
+          server_name: 'hello',
+          image_ref: '111',
+          flavor_ref: '1',
+          public_key_path: 'tarpals',
+          config_drive: true
+        }
+      end
+
+      it 'enables config drive' do
+        expect(servers).to receive(:create).with(
+          name: 'hello',
+          image_ref: '111',
+          flavor_ref: '1',
+          availability_zone: nil,
+          public_key_path: 'tarpals',
+          config_drive: true
+        )
         driver.send(:create_server)
       end
     end
@@ -952,9 +977,11 @@ describe Kitchen::Driver::Openstack do
     context 'an OpenStack deployment without the floating IP extension' do
       before do
         allow(server).to receive(:public_ip_addresses).and_raise(
-          Fog::Compute::OpenStack::NotFound)
+          Fog::Compute::OpenStack::NotFound
+        )
         allow(server).to receive(:private_ip_addresses).and_raise(
-          Fog::Compute::OpenStack::NotFound)
+          Fog::Compute::OpenStack::NotFound
+        )
       end
 
       context 'both public and private IPs in the addresses hash' do
@@ -987,6 +1014,38 @@ describe Kitchen::Driver::Openstack do
         end
       end
 
+      context 'when openstack_network_name is provided and use_ipv6 is false' do
+        let(:addresses) do
+          {
+            'public' => [{ 'addr' => '4::1' }, { 'addr' => '7.7.7.7' }],
+            'private' => [{ 'addr' => '5::1' }, { 'addr' => '9.9.9.9' }]
+          }
+        end
+        let(:config) { { openstack_network_name: 'public' } }
+
+        it 'should respond with the first IPv4 address from the addresses' do
+          allow(driver).to receive(:config).and_return(config)
+
+          expect(driver.send(:get_ip, server)).to eq('7.7.7.7')
+        end
+      end
+
+      context 'when openstack_network_name is provided and use_ipv6 is true' do
+        let(:addresses) do
+          {
+            'public' => [{ 'addr' => '4::1' }, { 'addr' => '7.7.7.7' }],
+            'private' => [{ 'addr' => '5::1' }, { 'addr' => '9.9.9.9' }]
+          }
+        end
+        let(:config) { { openstack_network_name: 'public', use_ipv6: true } }
+
+        it 'should respond with the first IPv6 address from the addresses' do
+          allow(driver).to receive(:config).and_return(config)
+
+          expect(driver.send(:get_ip, server)).to eq('4::1')
+        end
+      end
+
       context 'only public IPs in the address hash' do
         let(:addresses) do
           { 'public' => [{ 'addr' => '6.6.6.6' }, { 'addr' => '7.7.7.7' }] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Jonathan Hartman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -199,6 +199,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Test Kitchen OpenStack Nova driver
 email:
 - j@p4nt5.com
@@ -242,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen OpenStack Nova driver