kitchen-softlayer 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9766860625cae0787f169af867cea6a78d8c6b31
-  data.tar.gz: 6f4756b197d1bced69bb816ab0adaee583c02b1e
+  metadata.gz: a682dc5e86608aba4f73514a566c33a5bf3facb3
+  data.tar.gz: 97350b99e4b7ece3b87fc0b3a3f54c631d99706e
 SHA512:
-  metadata.gz: c55e2002173315fa1f7d590ad1ad70a1f19048f1201a71a9e94bc7704010d7665ea5008bec40c46f960ee843e72c7d51aa9e38d949973459adad432d6b1437e4
-  data.tar.gz: ad2f0f55918ba7be3f31622e6369ae6bae0f6a998bd75a4aa8f2cd6cc0ca4916d66e18229442829eb3a16461c0dcdd1e21ad6672a1684ffbeb05b3b00287a5b3
+  metadata.gz: 89573962a152f004c8a476485017c9836d7504a2dfaf5d563efbf88e7c5ffccb661674677b9cd3a66e0b26062c6bf6ebac3411b5dd031133b2e79740eccf0d14
+  data.tar.gz: a4dd15a31f74a36f05c692583a64fae72401d862efeb2b3ef2708abda5c4a80f305454fa45e1695a61152d7961b61daab4ad9d71080dbb51f3ba6caa5d8d2551

data/README.md

@@ -98,7 +98,7 @@ softlayer_default_domain | ENV['softlayer_default_domain']
 server_name | nil | Server Name
 key_name | nil | the label of the uploaded key
 ssh_key| nil | file location of private key
-disable_ssl_validation | false | ssl validation for fg softlayer api
+disable_ssl_validation | false | ssl validation for fog softlayer api
 username | 'root' | server's administration user
 password | nil | server's administration password
 port | '22' | ssh port of servef
@@ -115,6 +115,8 @@ image_id | nil | image name or internal id
 ephemeral_storage | nil | storage
 network_components | nil | network
 ssh_timeout | 300 | timeout to ssh when server starting
+ssh_via_hostname | false | use hostname for ssh instead of IP
+alternate_ip | nil | alternate ip address for ssh access
 destroy_wait | true | wait for destroy to complete
 destroy_timeout | 300 | timeout to wait until server destroyed
 account_id | nil | softlayer account id

data/lib/kitchen/driver/softlayer.rb

@@ -72,6 +72,8 @@ module Kitchen
       default_config :vlan, nil
       default_config :private_vlan, nil
       default_config :provision_script, nil
+      default_config :ssh_via_hostname, false
+      default_config :alternate_ip, nil
 
       def create(state)
         config[:server_name] = default_name unless config[:server_name]
@@ -86,7 +88,13 @@ module Kitchen
         end
         info "\n(server ready)"
         tag_server(server)
-        state[:hostname] = get_ip(server)
+        if config[:ssh_via_hostname]
+          state[:hostname] = config[:hostname]
+        elsif config[:alternate_ip]
+          state[:hostname] = config[:alternate_ip]
+        else
+          state[:hostname] = get_ip(server)
+        end
         setup_ssh(server, state)
         wait_for_ssh_key_access(state)
       rescue Fog::Errors::Error, Excon::Errors::Error => ex

data/lib/kitchen/driver/softlayer_version.rb

@@ -15,6 +15,6 @@
 module Kitchen
   # Version string for Softlayer Kitchen driver
   module Driver
-    SOFTLAYER_VERSION = '0.0.6'
+    SOFTLAYER_VERSION = '0.0.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen