knife-digital_ocean 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28c9c6f7377667a5de1839a53db683f63d877e3a
-  data.tar.gz: 9c532b71267f41518f0e4464b8749a362cde1f56
+  metadata.gz: 26fba2dd736b05d2a0196f7fdefd5128978eeb8e
+  data.tar.gz: 32ecdbf611121df542dd0cbb8e7c2e383e1eb389
 SHA512:
-  metadata.gz: dada3b7a462d8fa2eaaf788387fd600a00a4ab7f9e9839c00dd24d7e7bc0e38d73f6ca731f1124098b3356145ae30826f2dd6020120a023fa1e036e857bbb4b7
-  data.tar.gz: a57a17a2448782f08406bd588d321edcded6072e03371b24de5adfe6fa80901837db4181c935980c32f7c3a8c223a28ee0c9a90091d1243a840725f93b131423
+  metadata.gz: aa2fb82e4c6348ccb5db5e021ca0d55d11d87916bd0484f5d5af61f8d2f6c7e654817d3eed1fb20c43a82f2eec0748cd98497b5361f1002774fff6d680947a0f
+  data.tar.gz: c65d383ea05cfeaf0c8e4d4be91246f168aee206b6ae8b2f6a2db60ca94132711d393be5ce252aff8e8f54051b66f229684b1bd789b2e306313ef8245f43f665

data/.travis.yml

@@ -1,11 +1,12 @@
 language: ruby
 rvm:
   - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - ruby-head
 matrix:
   allow_failures:
+    - rvm: 1.8.7
     - rvm: ruby-head
 script: bundle exec rake test

data/CHANGELOG.md

@@ -1,18 +1,28 @@
 ## unreleased
 
-* [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.4.0...master)
+* [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.5.0...master)
+
+
+## 0.5.0 / 2014-04-26
+
+* [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.4.0...v0.5.0)
+* support for private networking and secret-file (thanks @popsikle)
+* bump digital_ocean gem dependency (for faraday)
+
 
 ## 0.4.0 / 2013-12-30
 
 * [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.3.0...v0.4.0)
 * bump digital_ocean gem dependency
-_
+
+
 ## 0.3.0 / 2013-11-25
 
 * [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.2.0...v0.3.0)
 * support for first_boot_attributes/json-attributes (thanks @zuazo)
 * updated doc examples
 
+
 ## 0.2.0 / 2013-09-07
 
 * [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.1.1...v0.2.0)

data/README.md

@@ -66,7 +66,7 @@ If you use ```knife-solo``` try **B** and if you are a ```chef-server```-fan
 use method **A**:
 #### A. With bootstrapping in an chef-server environment:
 
-__Example__
+__Examples__
 
 ```shell
 ➜ knife digital_ocean droplet create --server-name awesome-vm1.chef.io \
@@ -74,8 +74,18 @@ __Example__
                                       --location 2 \
                                       --size 66 \
                                       --ssh-keys 1234,1235 \
+```
+
+```shell
+➜ knife digital_ocean droplet create --server-name awesome-vm2.chef.io \
+                                      --image 25306 \
+                                      --location 4 \
+                                      --size 66 \
+                                      --ssh-keys 1234,1235 \
                                       --bootstrap \
-                                      --run-list "role[base],role[webserver]"
+                                      --run-list "role[base],role[webserver]" \
+                                      --secret-file "~/.ssh/secret_file" \
+                                      --private_networking
 ```
 
 __Syntax__
@@ -87,7 +97,9 @@ __Syntax__
                                       --size <SIZE ID> \
                                       --ssh-keys <SSH KEY-ID(s), comma-separated> \
                                       --bootstrap \
-                                      --run-list "<RUNLIST>"
+                                      --run-list "<RUNLIST>" \
+                                      --secret-file "<FILENAME>" \
+                                      --private_networking
 ```
 
 __Short Syntax__
@@ -160,6 +172,8 @@ ID  Name
 2   Amsterdam 1
 3   San Francisco 1
 4   New York 2
+5   Amsterdam 2
+6   Singapore 1
 ```
 
 ### List sizes (instance types)
@@ -175,7 +189,6 @@ ID  Name
 60  32GB
 70  48GB
 69  64GB
-68  96GB
 66  512MB
 ```
 
@@ -203,36 +216,36 @@ ID       Distribution  Name                                             Global
 1601     CentOS        CentOS 5.8 x64                                   +
 376568   CentOS        CentOS 6.4 x32                                   +
 562354   CentOS        CentOS 6.4 x64                                   +
+3240847  CentOS        CentOS 6.5 x32                                   +
+3240850  CentOS        CentOS 6.5 x64                                   +
 12575    Debian        Debian 6.0 x32                                   +
 12573    Debian        Debian 6.0 x64                                   +
-303619   Debian        Debian 7.0 x32                                   +
-308287   Debian        Debian 7.0 x64                                   +
-32387    Fedora        Fedora 17 x32                                    +
-32399    Fedora        Fedora 17 x32 Desktop                            +
-32428    Fedora        Fedora 17 x64                                    +
-32419    Fedora        Fedora 17 x64 Desktop                            +
-697056   Fedora        Fedora 19 x32                                    +
-696598   Fedora        Fedora 19 x64                                    +
-1004145  Ubuntu        Docker on Ubuntu 13.04 x64                       +
-959207   Ubuntu        Ghost 0.3.3 on Ubuntu 12.04                      +
-1215015  Ubuntu        GitLab 6.2.4 CE                                  +
-459444   Ubuntu        LAMP on Ubuntu 12.04                             +
-483575   Ubuntu        Redmine on Ubuntu 12.04                          +
-464235   Ubuntu        Ruby on Rails on Ubuntu 12.10 (Nginx + Unicorn)  +
+3102384  Debian        Debian 7.0 x32                                   +
+3102387  Debian        Debian 7.0 x64                                   +
+3102721  Fedora        Fedora 19 x32                                    +
+3102879  Fedora        Fedora 19 x64                                    +
+3243143  Fedora        Fedora 20 x32                                    +
+3243145  Fedora        Fedora 20 x64                                    +
+3104894  Ubuntu        Docker 0.10 on Ubuntu 13.10 x64                  +
+3288841  Ubuntu        Dokku v0.2.3 on Ubuntu 14.04                     +
+3121555  Ubuntu        Ghost 0.4.2 on Ubuntu 12.04                      +
+3118238  Ubuntu        GitLab 6.6.5 CE                                  +
+3120115  Ubuntu        LAMP on Ubuntu 12.04                             +
+3118235  Ubuntu        MEAN on Ubuntu 12.04.4                           +
+3137903  Ubuntu        Redmine on Ubuntu 12.04                          +
+3137635  Ubuntu        Ruby on Rails on Ubuntu 12.10 (Nginx + Unicorn)  +
 14098    Ubuntu        Ubuntu 10.04 x32                                 +
 14097    Ubuntu        Ubuntu 10.04 x64                                 +
-284211   Ubuntu        Ubuntu 12.04 x32                                 +
-284203   Ubuntu        Ubuntu 12.04 x64                                 +
-1015250  Ubuntu        Ubuntu 12.04.3 x32                               +
-1015253  Ubuntu        Ubuntu 12.04.3 x64                               +
-433240   Ubuntu        Ubuntu 12.10 x32                                 +
-473123   Ubuntu        Ubuntu 12.10 x64                                 +
-473136   Ubuntu        Ubuntu 12.10 x64 Desktop                         +
-345791   Ubuntu        Ubuntu 13.04 x32                                 +
-350076   Ubuntu        Ubuntu 13.04 x64                                 +
-962304   Ubuntu        Ubuntu 13.10 x32                                 +
-961965   Ubuntu        Ubuntu 13.10 x64                                 +
-1061995  Ubuntu        Wordpress on Ubuntu 12.10                        +
+3100616  Ubuntu        Ubuntu 12.04.4 x32                               +
+3101045  Ubuntu        Ubuntu 12.04.4 x64                               +
+3101888  Ubuntu        Ubuntu 12.10 x32                                 +
+3101891  Ubuntu        Ubuntu 12.10 x64                                 +
+3104282  Ubuntu        Ubuntu 12.10 x64 Desktop                         +
+3101580  Ubuntu        Ubuntu 13.10 x32                                 +
+3101918  Ubuntu        Ubuntu 13.10 x64                                 +
+3240033  Ubuntu        Ubuntu 14.04 x32                                 +
+3240036  Ubuntu        Ubuntu 14.04 x64                                 +
+3135725  Ubuntu        Wordpress on Ubuntu 13.10                        +
 ```
 
 
@@ -264,6 +277,7 @@ Commercial support is available. Please contact [https://roland.io/](https://rol
 ### Contributors
 
 *   [Teemu Matilainen](https://github.com/tmatilai)
+*   [Salvatore Poliandro](https://github.com/popsikle)
 
 For more information and a complete list see [the contributor page on GitHub](https://github.com/rmoriz/knife-digital_ocean/contributors).
 
@@ -283,15 +297,8 @@ Ever wanted to control your DigitalOcean Droplets with your iPhone, iPad or iPod
 
 ## Copyright
 
-Copyright © 2013 [Roland Moriz](https://roland.io), [Moriz GmbH](https://moriz.de/)
+Copyright © 2014 [Roland Moriz](https://roland.io), [Moriz GmbH](https://moriz.de/)
 
 [![LinkedIn](http://www.linkedin.com/img/webpromo/btn_viewmy_160x25.png)](http://www.linkedin.com/in/rmoriz)
 [![Twitter](http://i.imgur.com/1kYFHlu.png)](https://twitter.com/rmoriz)
 
-
-
-
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/rmoriz/knife-digital_ocean/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

data/knife-digital_ocean.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.license       = 'Apache 2.0'
 
   gem.add_dependency 'chef', '>= 10.18'
-  gem.add_dependency 'digital_ocean', '~> 1.3.0'
+  gem.add_dependency 'digital_ocean', '~> 1.4.0'
   gem.add_dependency 'highline'
 
   gem.add_development_dependency 'rspec', '~> 2.13'

data/lib/chef/knife/digital_ocean_droplet_create.rb

@@ -128,6 +128,16 @@ class Chef
         :description => 'A JSON string to be added to the first run of chef-client',
         :proc        => lambda { |o| JSON.parse(o) }
 
+      option :private_networking,
+        :long        => "--private_networking",
+        :description => "Enables private networking if the selected region supports it",
+        :default     => false
+
+      option :secret_file,
+        :long => "--secret-file SECRET_FILE",
+        :description => "A file containing the secret key to use to encrypt data bag item values",
+        :proc => Proc.new { |sf| Chef::Config[:knife][:secret_file] = sf }
+
       def run
         $stdout.sync = true
 
@@ -167,11 +177,12 @@ class Chef
           exit 1
         end
 
-        response = client.droplets.create(:name        => locate_config_value(:server_name),
-                                          :size_id     => locate_config_value(:size),
-                                          :image_id    => locate_config_value(:image),
-                                          :region_id   => locate_config_value(:location),
-                                          :ssh_key_ids => locate_config_value(:ssh_key_ids).join(','))
+        response = client.droplets.create(:name               => locate_config_value(:server_name),
+                                          :size_id            => locate_config_value(:size),
+                                          :image_id           => locate_config_value(:image),
+                                          :region_id          => locate_config_value(:location),
+                                          :ssh_key_ids        => locate_config_value(:ssh_key_ids).join(','),
+                                          :private_networking => locate_config_value(:private_networking))
 
         if response.status != 'OK'
           ui.error("Droplet could not be started #{response.inspect}")
@@ -252,6 +263,7 @@ class Chef
         bootstrap.config[:template_file] = locate_config_value(:template_file)
         bootstrap.config[:environment] = locate_config_value(:environment)
         bootstrap.config[:first_boot_attributes] = locate_config_value(:json_attributes) || {}
+        bootstrap.config[:secret_file] = locate_config_value(:secret_file) || {}
         bootstrap
       end
 

data/lib/knife-digital_ocean/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module DigitalOcean
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

data/spec/lib/chef/knife/digital_ocean_droplet_create_spec.rb

@@ -169,5 +169,19 @@ describe Chef::Knife::DigitalOceanDropletCreate do
     end
   end
 
+  context 'passing secret_file (--secret-file)' do
+    let(:secret_file) { '/tmp/sekretfile' }
+    let(:custom_config) {
+      {
+       :secret_file => secret_file
+      }
+    }
+
+    it 'secret_file should be available to Bootstrap' do
+      bootstrap = subject.bootstrap_for_node('123.123.123.123')
+      bootstrap.config[:secret_file].should eql(secret_file)
+    end
+  end
+
 end
 

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: knife-digital_ocean
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Roland Moriz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.18'
 - !ruby/object:Gem::Dependency
   name: digital_ocean
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: knife-solo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A plugin for chef's knife to manage instances of DigitalOcean servers
@@ -101,8 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -139,17 +139,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A plugin for chef's knife to manage instances of DigitalOcean servers