kitchen-digitalocean 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a669b7af410472688263197b6e5b3c4e7eeb614b
-  data.tar.gz: cf01c039328c88863b96c596b10d3ae116901e20
+  metadata.gz: 3ebb82e602775e316d08c72e2a79f468ff378e49
+  data.tar.gz: 1451ce62418adbf49f381b733a42fabfb45ce6c5
 SHA512:
-  metadata.gz: 66457401c61477be83f190cd9a88c368798a92d8c1b973b751dbbcc68a1197c55383e2471c9d6a56cfeafe6bf9f56d9a157de3489acbbc64b6a49b2849388026
-  data.tar.gz: 48f99c0cd80943287128d67e908a4489ae52ccba3db5d088bdafcc6bf637532bdf19c371385db87cbc9102fc7c49d857aa62d19bdd5f8cfb69eca14d340e7a76
+  metadata.gz: 91a784abd06dffbbbb9d222d2723a59946fcbe45af9eeb0c682236551ede2b313f10fca361bfff586c9bc13c9b1762f64bb2116e6337d18d2444351bffc801ac
+  data.tar.gz: 346799457ddb91daf2dc30cb1e6c9faaac8070e55273859afd93cf94b1a50245a719021f09921dadfbf6ca026557394a6db1b85c96343da400db73555c5ede97

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.6.0 / 2014-3-17
+
+* Private Networking is now enabled by default. This only works in select regions.
+* The default region was changed to New York 2, so private networking would work by default.
+
 # 0.5.2 / 2014-02-20
 
 * [@lamont-granquist](https://github.com/lamont-granquist) [PR #5] add info on using numeric key ids.

data/README.md

@@ -113,6 +113,17 @@ driver:
 
 For specific default values, please consult [digitalocean.json](https://github.com/test-kitchen/kitchen-digitalocean/blob/master/data/digitalocean.json).
 
+# Private Networking
+
+Private networking is enabled by default, but will only work in certain regions. You can disable private networking by changing private_networking to
+false. Example below.
+
+```ruby
+---
+driver:
+  - private_networking: false
+```
+
 # Development
 
 * Source hosted at [GitHub](https://github.com/test-kitchen/kitchen-digitalocean)

data/lib/kitchen/driver/digitalocean.rb

@@ -31,6 +31,10 @@ module Kitchen
       default_config :username, 'root'
       default_config :port, '22'
 
+      default_config :private_networking do |driver|
+        true
+      end
+
       default_config :region_id do |driver|
         driver.default_region
       end
@@ -96,7 +100,7 @@ module Kitchen
         data['regions'].each_pair do |key, value|
           regions[key.upcase] = value
         end
-        regions.fetch(config[:region] ? config[:region].upcase : nil) { '1' }
+        regions.fetch(config[:region] ? config[:region].upcase : nil) { '4' }
       end
 
       def default_image
@@ -127,18 +131,19 @@ module Kitchen
         debug_server_config
 
         compute.servers.create(
-          name:         config[:server_name],
-          image_id:     config[:image_id],
-          flavor_id:    config[:flavor_id],
-          region_id:    config[:region_id],
-          ssh_key_ids:  config[:ssh_key_ids]
+          name:               config[:server_name],
+          image_id:           config[:image_id],
+          flavor_id:          config[:flavor_id],
+          region_id:          config[:region_id],
+          ssh_key_ids:        config[:ssh_key_ids],
+          private_networking: config[:private_networking]
         )
       end
 
       def data
         @data ||= begin
           json_file = File.expand_path(
-            File.join(%w{.. .. .. .. data digitalocean.json}),
+            File.join(%w(.. .. .. .. data digitalocean.json)),
             __FILE__
           )
           JSON.load(IO.read(json_file))
@@ -151,6 +156,7 @@ module Kitchen
         debug("digitalocean:flavor_id #{config[:flavor_id]}")
         debug("digitalocean:region_id #{config[:region_id]}")
         debug("digitalocean:ssh_key_ids #{config[:ssh_key_ids]}")
+        debug("digitalocean:private_networking #{config[:private_networking]}")
       end
 
       def debug_compute_config

data/lib/kitchen/driver/digitalocean_version.rb

@@ -19,7 +19,7 @@
 module Kitchen
   module Driver
     # Version string for Digital Ocean Kitchen driver
-    DIGITALOCEAN_VERSION = '0.5.2'
+    DIGITALOCEAN_VERSION = '0.6.0'
   end
 end
 

data/spec/kitchen/driver/digitalocean_spec.rb

@@ -67,7 +67,7 @@ describe Kitchen::Driver::Digitalocean do
       end
 
       it 'defaults to region id 1' do
-        expect(driver[:region_id]).to eq('1')
+        expect(driver[:region_id]).to eq('4')
       end
 
       it 'defaults to SSH Key Ids from $SSH_KEY_IDS' do
@@ -258,6 +258,7 @@ describe Kitchen::Driver::Digitalocean do
         :image_id => 'there',
         :flavor_id => '68',
         :region_id => '3',
+        :private_networking => true,
         :ssh_key_ids => '1234'
       }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Greg Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen