kitchen-rax 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c4c22fb377b01cf730cd31dd72dc6de908e43b4
-  data.tar.gz: 298de706ad57ef5759a6bf41472e3f4a982478f6
+  metadata.gz: bfc94f8c28140b203dd41eada48141caa8807d70
+  data.tar.gz: 4c1bd141b46c01a319e0010c65b7e95a0315f34c
 SHA512:
-  metadata.gz: 3d33a6c0ab46b5b987b96095f4f2b65ea58c894a37c2f4b0a699fabf994fa9b68d7e09156a8a3a9cc9e2938bedeb2e570665949d74c60f956eaf186f1c98f80f
-  data.tar.gz: 011270625672dbb21aea541d619610a01d532882b683e82d149e5241ab054007d17ac01240fbcc423ecd20c90c7b2c498bf79f48ac772634ce7eac9922d855ff
+  metadata.gz: 1be5b082c84c9a791e3c423a94b88540a83db79ad2c27d5a74cc471a2e023a06b0344e8f028b61e06b21bcb0345c1898646b272580aae12798c2e41d26c925f6
+  data.tar.gz: 64dfe4131f17ff582bd7143a6726cfea74100aff8ea59f02c229ee19161a573d67dc204c6e1d3565771e7dee1de3325188f02ed57d2ad23069eea0d840ec4f14

data/lib/kitchen/driver/rax.rb

@@ -14,7 +14,7 @@ module Kitchen
 			default_config :port, '22'
 			default_config :rackspace_region, 'lon'
 			default_config :wait_for, 600
-			default_config(:image_id, &:default_image)
+			default_config :image_id
 			default_config(:server_name, &:default_name)
 			default_config :networks, nil
 
@@ -42,7 +42,8 @@ module Kitchen
 				server.wait_for { ready? }
 				puts '(server ready)'
 				rackconnect_check(server)
-				state[:hostname] = hostname(server)
+				state[:hostname] = server.public_ip_address
+				state[:password] = server.password
 				tcp_check(state)
 			rescue Fog::Errors::Error, Excon::Errors::Error => ex
 				raise ActionFailed, ex.message
@@ -69,14 +70,22 @@ module Kitchen
 		 end
 
 		 def create_server
-			 server_def = { name: config[:server_name], networks: networks }
+			 server_def = { name: default_name }
 			 [:image_id, :flavor_id].each do |opt|
 				 server_def[opt] = config[opt]
 			 end
 			 server_def[:no_passwd_lock] = true
-			 server = compute.servers.new(server_def).save
-			 username = instance.transport[:username]
-			 state[:password] = server.password
+			 server = compute.servers.new(server_def)
+			 server.save
+		 end
+
+		 def self.default_name
+			 [
+				 instance.name.gsub(/\W/, '')[0..14],
+				 (Etc.getlogin || 'nologin').gsub(/\W/, '')[0..14],
+				 Socket.gethostname.gsub(/\W/, '')[0..22],
+				 Array.new(7) { rand(36).to_s(36) }.join
+			 ].join('-')
 		 end
 
 		 def rackconnect_check(server)
@@ -85,18 +94,6 @@ module Kitchen
 			 server.update
 		 end
 
-		 def winrm_transport?
-	   		instance.transport.name.casecmp("winrm") == 0
-	   end
-
-		 def hostname(server)
-				 server.public_ip_address
-		 end
-
-		 def networks
-			 nil
-		 end
-
 		end
 	end
 end

data/lib/kitchen/driver/rax_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Rax Kitchen driver
-    RAX_VERSION = "0.5.0"
+    RAX_VERSION = "0.6.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-rax
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Olivier Kouame
@@ -127,7 +127,6 @@ files:
 - bin/console
 - bin/setup
 - kitchen-rax.gemspec
-- lib/kitchen/driver/helper.rb
 - lib/kitchen/driver/rax.rb
 - lib/kitchen/driver/rax_version.rb
 - spec/kitchen/rax_spec.rb

data/lib/kitchen/driver/helper.rb

@@ -1,16 +0,0 @@
-module Kitchen
-
-  module Driver
-
-		def self.default_name
-			[
-				instance.name.gsub(/\W/, '')[0..14],
-				(Etc.getlogin || 'nologin').gsub(/\W/, '')[0..14],
-				Socket.gethostname.gsub(/\W/, '')[0..22],
-				Array.new(7) { rand(36).to_s(36) }.join
-			].join('-')
-		end
-
-	end
-
-end