Merge pull request #76 from stephenlauck/digitalocean

Digitalocean
chef-cookbooks · Mar 12, 2015 · 2986a70 · 2986a70
2 parents dc77fca + 53f47e8
commit 2986a70
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.kitchen.cloud.yml b/.kitchen.cloud.yml
@@ -1,7 +1,8 @@
 #<% require 'kitchen-sync' %>
 ---
 driver_config:
-  digitalocean_client_id: <%= ENV['DIGITAL_OCEAN_CLIENT_ID'] %>
+  digitalocean_api_token: <%= ENV['DIGITAL_OCEAN_CLIENT_ID'] %>
+  digitalocean_client_id: <%= ENV['DIGITALOCEAN_ACCESS_TOKEN'] %>
   google_client_email: <%= ENV['GOOGLE_CLIENT_EMAIL'] %>
   google_key_location: <%= ENV['GOOGLE_KEY_LOCATION'] %>
   google_project: <%= ENV['GOOGLE_PROJECT'] %>
@@ -26,7 +27,7 @@ platforms:
     size: 2gb
     image: centos-5-11-x64
     region: <%= ENV['DIGITAL_OCEAN_REGION'] %>
-    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
+    ssh_keys: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
     ssh_key: <%= ENV['DIGITAL_OCEAN_SSH_KEY_PATH'] %>
 
 - name: centos-6.6
@@ -35,7 +36,7 @@ platforms:
     size: 2gb
     image: centos-6-6-x64
     region: <%= ENV['DIGITAL_OCEAN_REGION'] %>
-    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
+    ssh_keys: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
     ssh_key: <%= ENV['DIGITAL_OCEAN_SSH_KEY_PATH'] %>
 
 # - name: centos-7.0
@@ -44,7 +45,7 @@ platforms:
 #     size: 2gb
 #     image: centos-7-0-x64
 #     region: <%= ENV['DIGITAL_OCEAN_REGION'] %>
-#     ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
+#     ssh_keys: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
 #     ssh_key: <%= ENV['DIGITAL_OCEAN_SSH_KEY_PATH'] %>
 
 # - name: amazon-2014.09
@@ -60,21 +61,19 @@ platforms:
     size: 2gb
     image: ubuntu-12-04-x64
     region: <%= ENV['DIGITAL_OCEAN_REGION'] %>
-    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
+    ssh_keys: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
     ssh_key: <%= ENV['DIGITAL_OCEAN_SSH_KEY_PATH'] %>
   run_list:
-  - recipe[apt]
 
 - name: ubuntu-14.04
   driver_plugin: digital_ocean
   driver_config:
     size: 2gb
     image: ubuntu-14-04-x64
     region: <%= ENV['DIGITAL_OCEAN_REGION'] %>
-    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
+    ssh_keys: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
     ssh_key: <%= ENV['DIGITAL_OCEAN_SSH_KEY_PATH'] %>
   run_list:
-  - recipe[apt]
 
 suites:
 - name: default

diff --git a/Gemfile b/Gemfile
@@ -13,14 +13,15 @@ end
 
 group :kitchen_common do
   gem 'test-kitchen', '~> 1.2'
+  gem 'kitchen-sync'
 end
 
 group :kitchen_vagrant do
   gem 'kitchen-vagrant', '~> 0.11'
 end
 
 group :kitchen_cloud do
-  gem 'kitchen-digitalocean'
+  gem 'kitchen-digital_ocean'
   gem 'kitchen-ec2'
 end