knife-digital_ocean 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d6837eb0ed9318f5dc3d7df661b9d7fa74bdb86
-  data.tar.gz: 6c959c38bbcb222e5792ac208d8fa034e10c0cbb
+  metadata.gz: bcaa540a4c2588d80c68a17e3b6452bbcdd27040
+  data.tar.gz: 052741d324574109a77856ee2e6b1af7dc14b49f
 SHA512:
-  metadata.gz: b43a58d4b73a34bd132db0f7167b7fe68bad93f38e1b63d4c8d04f18778a307056ca75e7ba6b1da8b3555e90358aeb1f26a49f99438e5d44ff20391e15524a58
-  data.tar.gz: e4bfe933f58ca1670c91f835d1f3e18f3ea1126c307f73168f7b5e92397d8ca7c0bc99eb3d76559d228121ccc61e3a9521547e2c346c740984d81b46cdcf901d
+  metadata.gz: af0644ed882e619d058872977e990552d84620dd2e1389cc2d4fcaa069ededfaed41d1890308cb79f83d1963b436f03e25ef6017c2506fd531a5ee7165efbe48
+  data.tar.gz: 82c65b7d2ef506181d0f7ac5076aeabbd88ca66901857cf74c89dcd5db67ff2207b0dfac160345c890266a2f29f3ddde2c05e89fdc7505cfd1a5e23da070b7c6

data/CHANGELOG.md

@@ -1,7 +1,12 @@
 ## unreleased
 
-* [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.2.0...master)
+* [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.3.0...master)
 
+## 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
 

data/README.md

@@ -23,25 +23,25 @@ This knife plugin uses the [digital_ocean](https://github.com/rmoriz/digital_oce
 
 This plugin provides the following sub-commands:
 
-* knife digital_ocean droplet create (options)   
+* knife digital_ocean droplet create (options)
   **Creates a virtual machine with or without bootstrapping chef**
 
-* knife digital_ocean droplet destroy (options)  
+* knife digital_ocean droplet destroy (options)
   **Destroys the virtual machine and its data**
 
-* knife digital_ocean droplet list (options)     
+* knife digital_ocean droplet list (options)
   **Lists currently running virtual machines**
 
-* knife digital_ocean image list (options)       
+* knife digital_ocean image list (options)
   **Lists available images (snapshots, backups, OS-images)**
 
-* knife digital_ocean region list (options)      
+* knife digital_ocean region list (options)
   **Lists the server regions/locations/data-center**
 
-* knife digital_ocean size list (options)        
+* knife digital_ocean size list (options)
   **Lists the available server sizes**
 
-* knife digital_ocean sshkey list                
+* knife digital_ocean sshkey list
   **Lists name + id of the uploaded known ssh keys**
 
 
@@ -60,8 +60,8 @@ knife[:digital_ocean_api_key]   = 'YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY'
 
 There are three different ways of creating a server/droplet instance:
 
-If you just want to launch an instance 
-form the command line without any bootstrapping, go for option **C**. 
+If you just want to launch an instance
+form the command line without any bootstrapping, go for option **C**.
 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:
@@ -107,6 +107,7 @@ __Short Syntax__
 You need to have [knife-solo](http://matschaffer.github.com/knife-solo/) gem installed.
 
 This will create a droplet and run `knife solo bootstrap <IP>` equivalent for it.
+Please consult the [knife-solo documentation](http://matschaffer.github.io/knife-solo/#label-Bootstrap+command) for further details.
 
 __Example__
 
@@ -116,6 +117,7 @@ __Example__
                                       --location 2 \
                                       --size 66 \
                                       --ssh-keys 1234,4567 \
+                                      --run-list "<RUNLIST>" \
                                       --solo
 ```
 
@@ -153,25 +155,27 @@ OK
 
 ```shell
 ➜ knife digital_ocean region list
-ID  Name       
-1   New York 1 
+ID  Name
+1   New York 1
 2   Amsterdam 1
+3   San Francisco 1
+4   New York 2
 ```
 
 ### List sizes (instance types)
 
 ```shell
-➜ knife digital_ocean size list  
-ID  Name 
-63  1GB  
-62  2GB  
-64  4GB  
-65  8GB  
-61  16GB 
-60  32GB 
-70  48GB 
-69  64GB 
-68  96GB 
+➜ knife digital_ocean size list
+ID  Name
+63  1GB
+62  2GB
+64  4GB
+65  8GB
+61  16GB
+60  32GB
+70  48GB
+69  64GB
+68  96GB
 66  512MB
 ```
 
@@ -182,9 +186,9 @@ ID  Name
 ```shell
 ➜ knife digital_ocean image list
 ID     Distribution  Name                                Global
-11111  Ubuntu        app100.ams.nlxxxxx.net 2013-02-01   -     
-11112  Ubuntu        app100.ams.nlxxxxx.net 2013-02-03   -     
-11113  Ubuntu        init                                -     
+11111  Ubuntu        app100.ams.nlxxxxx.net 2013-02-01   -
+11112  Ubuntu        app100.ams.nlxxxxx.net 2013-02-03   -
+11113  Ubuntu        init                                -
 ```
 
 
@@ -192,49 +196,51 @@ ID     Distribution  Name                                Global
 
 ```shell
 ➜ knife digital_ocean image list --global
-ID     Distribution  Name                                 Global
-23593  Arch Linux    Arch Linux 2012-09 x64               +     
-1602   CentOS        CentOS 5.8 x32                       +     
-1601   CentOS        CentOS 5.8 x64                       +     
-1605   CentOS        CentOS 6.0 x32                       +     
-1611   CentOS        CentOS 6.2 x64                       +     
-12578  CentOS        CentOS 6.3 x32                       +     
-12574  CentOS        CentOS 6.3 x64                       +     
-12575  Debian        Debian 6.0 x32                       +     
-12573  Debian        Debian 6.0 x64                       +     
-1606   Fedora        Fedora 15 x64                        +     
-1618   Fedora        Fedora 16 x64 Desktop                +     
-1615   Fedora        Fedora 16 x64 Server                 +     
-32399  Fedora        Fedora 17 x32 Desktop                +     
-32387  Fedora        Fedora 17 x32 Server                 +     
-32419  Fedora        Fedora 17 x64 Desktop                +     
-32428  Fedora        Fedora 17 x64 Server                 +     
-63749  Gentoo        Gentoo 2013-1 x64                    +     
-1607   Gentoo        Gentoo x64                           +     
-46964  Ubuntu        LAMP on Ubuntu 12.04                 +     
-4870   Ubuntu        Rails 3.2.2 - Nginx MySQL Passenger  +     
-14098  Ubuntu        Ubuntu 10.04 x32 Server              +     
-14097  Ubuntu        Ubuntu 10.04 x64 Server              +     
-43462  Ubuntu        Ubuntu 11.04x32 Desktop              +     
-43458  Ubuntu        Ubuntu 11.04x64 Server               +     
-1609   Ubuntu        Ubuntu 11.10 x32 Server              +     
-42735  Ubuntu        Ubuntu 12.04 x32 Server              +     
-14218  Ubuntu        Ubuntu 12.04 x64 Desktop             +     
-2676   Ubuntu        Ubuntu 12.04 x64 Server              +     
-25485  Ubuntu        Ubuntu 12.10 x32 Desktop             +     
-25306  Ubuntu        Ubuntu 12.10 x32 Server              +     
-25493  Ubuntu        Ubuntu 12.10 x64 Desktop             +     
-25489  Ubuntu        Ubuntu 12.10 x64 Server              +     
-13632  openSUSE      Open Suse 12.1 x32                   +     
-13863  openSUSE      Open Suse 12.2 X64                   +  
+ID       Distribution  Name                                             Global
+361740   Arch Linux    Arch Linux 2013.05 x32                           +
+350424   Arch Linux    Arch Linux 2013.05 x64                           +
+1602     CentOS        CentOS 5.8 x32                                   +
+1601     CentOS        CentOS 5.8 x64                                   +
+376568   CentOS        CentOS 6.4 x32                                   +
+562354   CentOS        CentOS 6.4 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)  +
+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                        +
 ```
 
 
 ### SSH keys (previously uploaded via DigitalOcean's webfrontend)
 
 ```shell
-➜ knife digital_ocean sshkey list    
-ID    Name  
+➜ knife digital_ocean sshkey list
+ID    Name
 1234  Alice
 1235  Bob
 1236  Chuck

data/knife-digital_ocean.gemspec

@@ -18,9 +18,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'highline'
 
   gem.add_development_dependency 'rspec', '~> 2.13'
-  gem.add_development_dependency 'guard'
-  gem.add_development_dependency 'guard-rspec'
-  gem.add_development_dependency 'rb-fsevent'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'knife-solo'
 

data/lib/chef/knife/digital_ocean_droplet_create.rb

@@ -122,6 +122,12 @@ class Chef
         :proc        => Proc.new { |e| Chef::Config[:knife][:environment] = e },
         :default     => '_default'
 
+      option :json_attributes,
+        :short       => '-j JSON',
+        :long        => '--json-attributes JSON',
+        :description => 'A JSON string to be added to the first run of chef-client',
+        :proc        => lambda { |o| JSON.parse(o) }
+
       def run
         $stdout.sync = true
 
@@ -174,6 +180,10 @@ class Chef
 
         puts "Droplet creation for #{locate_config_value(:server_name)} started. Droplet-ID is #{response.droplet.id}"
 
+        unless !config.has_key?(:json_attributes) || config[:json_attributes].empty?
+          puts ui.color("JSON Attributes: #{config[:json_attributes]}", :magenta)
+        end
+
         print ui.color("Waiting for IPv4-Address", :magenta)
         print(".") until ip_address = ip_address_available(response.droplet.id) {
           puts 'done'
@@ -241,6 +251,7 @@ class Chef
         bootstrap.config[:use_sudo] = true unless config[:ssh_user] == 'root'
         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
       end
 

data/lib/knife-digital_ocean/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module DigitalOcean
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

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

@@ -39,7 +39,13 @@ describe Chef::Knife::DigitalOceanDropletCreate do
     Chef::Knife::DigitalOceanDropletCreate.load_deps
 
     # reset
-    Chef::Config[:knife] = {}
+    if Chef::Config[:knife].respond_to?(:reset)
+      # mixlib-config >= 2
+      Chef::Config[:knife].reset
+    else
+      # mixlib-config < 2
+      Chef::Config[:knife] = {}
+    end
 
     # config
     config.merge(custom_config).each do |k, v|
@@ -148,5 +154,20 @@ describe Chef::Knife::DigitalOceanDropletCreate do
       end
     end
   end
+
+  context 'passing json attributes (-j)' do
+    let(:json_attributes) { '{ "apache": { "listen_ports": 80 } }' }
+    let(:custom_config) {
+      {
+       :json_attributes => json_attributes
+      }
+    }
+
+    it 'should configure the first boot attributes on Bootstrap' do
+      bootstrap = subject.bootstrap_for_node('123.123.123.123')
+      bootstrap.config[:first_boot_attributes].should eql(json_attributes)
+    end
+  end
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-digital_ocean
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Roland Moriz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -66,48 +66,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.13'
-- !ruby/object:Gem::Dependency
-  name: guard
-  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: guard-rspec
-  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: rb-fsevent
-  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -191,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A plugin for chef's knife to manage instances of DigitalOcean servers