kitchen-rackspace 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6469e67fffc7ea57b835b40acdee063915b1e4f
-  data.tar.gz: 0d68de2a3c6855dc93ab3d8901692c7f86e8e94e
+  metadata.gz: e320297bfe8e683d298155da6bf1864c420b3691
+  data.tar.gz: 633656517754c67fc5aa1f466f0e6a4430552d37
 SHA512:
-  metadata.gz: b0d461f568bb73502343717b8cf6c6fff0c94b6401b5e12040111a2a281fbbfab373992e3bfe79ed783aac82982e66232b70dc9ebf72af85c9758e9833cb7249
-  data.tar.gz: 136be154ad4f08c62986760a1fb35039ac64f1c7c6f0ccbbe22358a82b1fff4a92304c36a30fb614f9448264b121b8cee2e2df1ae3ee28df83009bc2c798fca5
+  metadata.gz: 14d8e600b6b7eff9799fc3e084552528688cbe88d8033b5e4e2e518b8049b3e95866e93cfd4898475ad9cbb31f3f5173109113b8e090e8f63b9c2a9873ce051d
+  data.tar.gz: a6c176366ffea6994bd71d252d5deb92743e711a3e64135867b5fde52734e67b670b4c13d92a15fe1074babf9be50f8df65d6d49ac2355d923fa6cd527f36f51

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.7.0 / 2014-07-09
+
+### New Features
+
+* PR [#31][] - Support attaching to custom networks, via [@kanerogers][]
+* PR [#29][] - Support using a sleep instead of TCP check in cases where new
+servers might fail the TCP; via [@martinb3][]
+
 # 0.6.1 / 2014-06-03
 
 ### Bug Fixes
@@ -62,6 +70,8 @@ boot times, via [@coderanger][]
 
 * Initial release! Woo!
 
+[#31]: https://github.com/test-kitchen/kitchen-rackspace/pull/31
+[#29]: https://github.com/test-kitchen/kitchen-rackspace/pull/29
 [#26]: https://github.com/test-kitchen/kitchen-rackspace/pull/26
 [#25]: https://github.com/test-kitchen/kitchen-rackspace/pull/25
 [#24]: https://github.com/test-kitchen/kitchen-rackspace/pull/24
@@ -74,6 +84,8 @@ boot times, via [@coderanger][]
 [#8]: https://github.com/test-kitchen/kitchen-rackspace/pull/8
 [#7]: https://github.com/test-kitchen/kitchen-rackspace/pull/7
 
+[@kanerogers]: https://github.com/kanerogers
+[@martinb3]: https://github.com/martinb3
 [@pezholio]: https://github.com/pezholio
 [@coderanger]: https://github.com/coderanger
 [@claco]: https://github.com/claco

data/README.md

@@ -33,7 +33,7 @@ Provide, at a minimum, the required driver options in your `.kitchen.yml` file:
       name: rackspace
       rackspace_username: [YOUR RACKSPACE CLOUD USERNAME]
       rackspace_api_key: [YOUR RACKSPACE CLOUD API KEY]
-      require_chef_omnibus: latest (if you'll be using Chef)
+      require_chef_omnibus: [e.g. 'true' or a version number if you need Chef]
     platforms:
       - name: [A PLATFORM NAME, e.g. 'centos-6']
 
@@ -46,12 +46,22 @@ for your specified platform. Additional, optional overrides can be provided:
     public_key_path: [PATH TO YOUR PUBLIC SSH KEY]
     rackspace_region: [A VALID RACKSPACE DC/REGION]
     wait_for: [NUM OF SECONDS TO WAIT BEFORE TIMING OUT, DEFAULT 600]
+    no_ssh_tcp_check: [DEFAULTS TO false, SKIPS TCP CHECK WHEN true]
+    no_ssh_tcp_check_sleep: [NUM OF SECONDS TO SLEEP IF no_ssh_tcp_check IS SET]
+    networks: [LIST OF RACKSPACE NETWORK UUIDS, DEFAULT PUBLICNET AND SERVICE NET]
 
 You also have the option of providing some configs via environment variables:
 
     export RACKSPACE_USERNAME="user"   # (or OS_USERNAME)
     export RACKSPACE_API_KEY="api_key" # (or OS_PASSWORD)
 
+Some configs are also derived based on your .ssh directory, specifically the
+`public_key_path` setting is derived by searching for:
+- `~/.ssh/id_rsa.pub`
+- `~/.ssh/id_dsa.pub`
+- `~/.ssh/identity.pub`
+- `~/.ssh/id_ecdsa.pub`
+
 ## Contributing
 
 1. Fork it

data/lib/kitchen/driver/rackspace.rb

@@ -34,14 +34,11 @@ module Kitchen
       default_config :port, '22'
       default_config :rackspace_region, 'dfw'
       default_config :wait_for, 600
-
-      default_config :image_id do |driver|
-        driver.default_image
-      end
-
-      default_config :server_name do |driver|
-        driver.default_name
-      end
+      default_config :no_ssh_tcp_check, false
+      default_config :no_ssh_tcp_check_sleep, 120
+      default_config(:image_id) { |driver| driver.default_image }
+      default_config(:server_name) { |driver| driver.default_name }
+      default_config :networks, nil
 
       default_config :public_key_path do
         [
@@ -77,8 +74,7 @@ module Kitchen
         server.wait_for { ready? }
         puts '(server ready)'
         state[:hostname] = server.public_ip_address
-        wait_for_sshd(state[:hostname])
-        puts '(ssh ready)'
+        tcp_check(state)
       rescue Fog::Errors::Error, Excon::Errors::Error => ex
         raise ActionFailed, ex.message
       end
@@ -106,36 +102,45 @@ module Kitchen
       private
 
       def compute
-        server_def = {
-          provider:           'Rackspace',
-          version:            config[:version],
-          rackspace_username: config[:rackspace_username],
-          rackspace_api_key:  config[:rackspace_api_key]
-        }
-        if config[:rackspace_region]
-          server_def[:rackspace_region] = config[:rackspace_region]
+        server_def = { provider: 'Rackspace' }
+        opts = [:version, :rackspace_username, :rackspace_api_key,
+                :rackspace_region]
+        opts.each do |opt|
+          server_def[opt] = config[opt]
         end
         Fog::Compute.new(server_def)
       end
 
       def create_server
-        compute.servers.bootstrap(
-          name:            config[:server_name],
-          image_id:        config[:image_id],
-          flavor_id:       config[:flavor_id],
-          public_key_path: config[:public_key_path]
-        )
+        server_def = { name: config[:server_name], networks: networks }
+        [:image_id, :flavor_id, :public_key_path].each do |opt|
+          server_def[opt] = config[opt]
+        end
+        compute.servers.bootstrap(server_def)
       end
 
       def images
         @images ||= begin
-          json_file = File.expand_path(
-            File.join(%w(.. .. .. .. data images.json)),
-            __FILE__
-          )
+          json_file = File.expand_path('../../../../data/images.json', __FILE__)
           JSON.load(IO.read(json_file))
         end
       end
+
+      def tcp_check(state)
+        # allow driver config to bypass SSH tcp check -- because
+        # it doesn't respect ssh_config values that might be required
+        wait_for_sshd(state[:hostname]) unless config[:no_ssh_tcp_check]
+        sleep(config[:no_ssh_tcp_check_sleep]) if config[:no_ssh_tcp_check]
+        puts '(ssh ready)'
+      end
+
+      def networks
+        base_nets = %w(
+          00000000-0000-0000-0000-000000000000
+          11111111-1111-1111-1111-111111111111
+        )
+        config[:networks] ? base_nets + config[:networks] : nil
+      end
     end
   end
 end

data/lib/kitchen/driver/rackspace_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   #
   # @author Jonathan Hartman <j@p4nt5.com>
   module Driver
-    RACKSPACE_VERSION = '0.6.1'
+    RACKSPACE_VERSION = '0.7.0'
   end
 end

data/spec/kitchen/driver/rackspace_spec.rb

@@ -29,6 +29,7 @@ describe Kitchen::Driver::Rackspace do
   let(:config) { Hash.new }
   let(:state) { Hash.new }
   let(:platform_name) { 'ubuntu' }
+  let(:default_networks) { nil }
 
   let(:instance) do
     double(
@@ -95,6 +96,18 @@ describe Kitchen::Driver::Rackspace do
         expect(driver[:wait_for]).to eq(600)
         expect(Fog).to have_received(:timeout=).with(600)
       end
+
+      it 'defaults the SSH TCP bypassing to false' do
+        expect(driver[:no_ssh_tcp_check]).to eq(false)
+      end
+
+      it 'defaults the TCP bypass sleep time to 120 seconds' do
+        expect(driver[:no_ssh_tcp_check_sleep]).to eq(120)
+      end
+
+      it 'defaults to the standard Rackspace networks' do
+        expect(driver[:networks]).to eq(default_networks)
+      end
     end
 
     platforms = {
@@ -161,7 +174,8 @@ describe Kitchen::Driver::Rackspace do
 
   describe '#create' do
     let(:server) do
-      double(id: 'test123', wait_for: true,
+      double(id: 'test123',
+             wait_for: true,
              public_ip_address: '1.2.3.4')
     end
     let(:driver) do
@@ -170,7 +184,7 @@ describe Kitchen::Driver::Rackspace do
       d.instance = instance
       allow(d).to receive(:default_name).and_return('a_monkey!')
       allow(d).to receive(:create_server).and_return(server)
-      allow(d).to receive(:wait_for_sshd).with('1.2.3.4').and_return(true)
+      allow(d).to receive(:tcp_check).and_return(true)
       d
     end
 
@@ -197,7 +211,13 @@ describe Kitchen::Driver::Rackspace do
         driver.create(state)
         expect(state[:hostname]).to eq('1.2.3.4')
       end
+
+      it 'calls tcp_check' do
+        expect(driver).to receive(:tcp_check)
+        driver.create(state)
+      end
     end
+
   end
 
   describe '#destroy' do
@@ -299,7 +319,8 @@ describe Kitchen::Driver::Rackspace do
         server_name: 'hello',
         image_id: 'there',
         flavor_id: 'captain',
-        public_key_path: 'tarpals'
+        public_key_path: 'tarpals',
+        networks: default_networks
       }
     end
     before(:each) do
@@ -324,6 +345,40 @@ describe Kitchen::Driver::Rackspace do
     it 'creates the server using a compute connection' do
       expect(driver.send(:create_server)).to eq(@expected)
     end
+
+    context 'additional networks specified' do
+      let(:server_id) { '12345' }
+      let(:server) do
+        double(id: 'test123', wait_for: true,
+               public_ip_address: '1.2.3.4')
+      end
+      let(:hostname) { 'example.com' }
+      let(:servers_double) { double('servers', bootstrap: server) }
+      let(:compute_double) { double(Fog::Compute, servers: servers_double) }
+      let(:state) { { server_id: server_id, hostname: hostname } }
+      let(:driver) do
+        d = Kitchen::Driver::Rackspace.new(config)
+        allow(d).to receive(:wait_for_sshd).with('1.2.3.4').and_return(true)
+        d.instance = instance
+        allow(Fog::Compute).to receive(:new).and_return(compute_double)
+        d
+      end
+      let(:user_specified_network) { 'bob_dole' }
+      let(:config) do
+        {
+          rackspace_username: 'monkey',
+          rackspace_api_key: 'potato',
+          rackspace_region: 'ord',
+          networks: [user_specified_network]
+        }
+      end
+      it 'has the user specified network, plus default Rackspace networks' do
+        driver.create(state)
+        expect(servers_double).to have_received(:bootstrap) do |arg|
+          expect(arg[:networks][2]).to eq user_specified_network
+        end
+      end
+    end
   end
 
   describe '#default_name' do
@@ -337,4 +392,50 @@ describe Kitchen::Driver::Rackspace do
         /^potatoes-user-host-/)
     end
   end
+
+  describe '#tcp_check' do
+    before(:each) do
+      allow_any_instance_of(described_class).to receive(:wait_for_sshd)
+      allow_any_instance_of(described_class).to receive(:sleep)
+    end
+
+    context 'the default non-skipping behavior' do
+      it "uses Kitchen's own SSH check" do
+        expect(driver).to receive(:wait_for_sshd)
+        expect(driver).to_not receive(:sleep)
+        driver.send(:tcp_check, state)
+      end
+    end
+
+    context 'a config set to wait instead of TCP check' do
+      let(:config) { { no_ssh_tcp_check: true } }
+
+      it 'uses a sleep instead of a port check' do
+        expect(driver).to_not receive(:wait_for_sshd)
+        expect(driver).to receive(:sleep)
+        driver.send(:tcp_check, state)
+      end
+    end
+  end
+
+  describe '#networks' do
+    context 'the default Rackspace networks' do
+      it 'returns nil so Fog will use the defaults' do
+        expect(driver.send(:networks)).to eq(nil)
+      end
+    end
+
+    context 'a custom Rackspace network' do
+      let(:config) { { networks: %w(abcdefg) } }
+
+      it 'returns the base networks plus the custom one' do
+        expected = %w(
+          00000000-0000-0000-0000-000000000000
+          11111111-1111-1111-1111-111111111111
+          abcdefg
+        )
+        expect(driver.send(:networks)).to eq(expected)
+      end
+    end
+  end
 end

metadata

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