knife-server 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27f50b0e90320e91ee8aa88d87c08dbf570f856e
-  data.tar.gz: deabf7cb66885f2566953221cfa843753e6b7aad
+  metadata.gz: 7f3438d1a1763d6e1b499924e5d003bbf61bedc1
+  data.tar.gz: 7e323fdee09dc509f99116e5ac0dd58e367c885e
 SHA512:
-  metadata.gz: ae51fa3de1500febc09772c79edc354db518afb0e42b5c649db0fc7e2e5e3c50517b48c7499c1f5677044c6580ba8319d694f9dfe9cd10a92ef029262efa3962
-  data.tar.gz: 21b67c8ca3a1e0ce7f54bd600d9a8c9999a711ccfa23c660515403434608efdf73b423b06acf717f0879c20a6987c16ede9da701bd3a5b376df126f50e183a82
+  metadata.gz: 1c490bfd6820c94c6e7e3065f36b7265096a81b3474627f92cb253017dc665b66ca90b3f26f5a27a1b717d8d0092ee6d68f3da8366158f8c2d7535aca7dd973d
+  data.tar.gz: f53bb247487c0cb4f29e6f7fcab5ca3b0049ece1db8bc7a3ecf36c979a19f467f7a9989fe2d77cb4c3fba3b9e25cd25d7adbca727b86aa073c62fd2b28099600

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.3.0 / 2014-09-14
+
+### New features
+
+* Pull request [#55][]: Add Digital Ocean support! ([@fnichol][])
+
+
 ## 1.2.0 / 2014-09-13
 
 ### Upstream changes
@@ -194,6 +201,7 @@ The initial release.
 [#48]: https://github.com/fnichol/knife-server/issues/48
 [#50]: https://github.com/fnichol/knife-server/issues/50
 [#51]: https://github.com/fnichol/knife-server/issues/51
+[#55]: https://github.com/fnichol/knife-server/issues/55
 [@danryan]: https://github.com/danryan
 [@dldinternet]: https://github.com/dldinternet
 [@erikh]: https://github.com/erikh

data/README.md

@@ -1,12 +1,14 @@
 # <a name="title"></a> Knife::Server
 
+[![Gem Version](https://badge.fury.io/rb/knife-server.svg)](http://badge.fury.io/rb/knife-server)
 [![Build Status](https://secure.travis-ci.org/fnichol/knife-server.png?branch=master)](http://travis-ci.org/fnichol/knife-server)
 [![Code Climate](https://codeclimate.com/github/fnichol/knife-server.png)](https://codeclimate.com/github/fnichol/knife-server)
+[![Dependency Status](https://gemnasium.com/fnichol/knife-server.png)](https://gemnasium.com/fnichol/knife-server)
 
-An Opscode Chef knife plugin to manage Chef Servers. Bootstrap a new Chef
-Server on Amazon's EC2, Linode or a standalone server. Backup and restore
-your Chef Server or Hosted Chef's node, role, data bag, and environment JSON
-data.
+An Chef Knife plugin to manage Chef Servers. Bootstrap a new Chef
+Server on Amazon's EC2, Digital Ocean, Linode, OpenStack or a standalone server.
+Backup and restore your Chef Server or Hosted Chef's node, role, data bag, and
+environment JSON data.
 
 ## <a name="usage"></a> Usage
 
@@ -37,6 +39,20 @@ $ knife server bootstrap ec2 \
   --ssh-user ubuntu
 ```
 
+To spin up your Chef Server on [Digital Ocean][do_site]:
+
+```bash
+knife server bootstrap digitalocean \
+  --node-name chefapalooza.example.com \
+  --digital_ocean_client_id $DIGITAL_OCEAN_CLIENT_ID \
+  --digital_ocean_api_key $DIGITAL_OCEAN_API_KEY \
+  --location 3 \
+  --size 63 \
+  --image 5588928 \
+  --ssh-keys $DIGITAL_OCEAN_SSH_KEY_ID \
+  --identity-file ~/.ssh/id_rsa-do
+```
+
 To spin up your Chef Server on Linode:
 
 ```bash
@@ -120,12 +136,15 @@ Add this line to your application's Gemfile:
 gem 'knife-server'
 ```
 
-**Note** If you want to use the `bootstrap ec2` or `bootstrap linode`
+**Note** If you want to use the `bootstrap ec2`, `bootstrap digitalocean`,
+`bootstrap linode`, or `bootstrap openstack`
 subcommands you will need to explicitly add this to your Gemfile with:
 
 ```ruby
 gem 'knife-ec2'
+gem 'knife-digital_ocean'
 gem 'knife-linode'
+gem 'knife-openstack'
 ```
 
 Finally execute:
@@ -140,8 +159,9 @@ Or install it yourself as:
 $ gem install knife-server
 ```
 
-(Don't forget a `gem install knife-ec2` or `gem install knife-linode` if using
-the `bootstrap ec2` or `bootstrap linode` subcommands).
+(Don't forget a `gem install knife-ec2`, `gem install knife-digital_ocean`,
+`gem install knife-linode`, or `gem install knife-openstack` if using any
+cloud-specific subcommands).
 
 Next, you **must** set up a [knife.rb configuration](#installation-knife) so
 that the shipped Knife subcommands know where to place and modify key files,
@@ -194,6 +214,10 @@ knife[:flavor] = "t1.micro"
 
 # for linode
 knife[:linode_api_key] = "MY_KEY"
+
+# for digitalocean
+knife[:digital_ocean_client_id] = "MY_CLIENT_ID"
+knife[:digital_ocean_api_key] = "MY_KEY"
 ```
 
 Better yet, why not try a more generic [knife.rb][chef_bootstrap_knife_rb] file
@@ -406,22 +430,28 @@ The resulting set will include:
 * `"Node=#{config[:chef_node_name]}"`
 * `"Role=chef_server"`
 
-### <a name="knife-server-bootstrap-linode"></a> knife server bootstrap linode
+### <a name="knife-server-bootstrap-digitalocean"></a> knife server bootstrap digitalocean
 
-**Note:** You must install the [knife-linode gem][knife-linode] to use this
-subcommand. This was done to keep the dependencies of this library lighter and
-to make future cloud adapter support easier to add.
+**Note:** You must install the [knife-digital_ocean gem][knife-digital_ocean]
+to use this subcommand. This was done to keep the dependencies of this library
+lighter and to make future cloud adapter support easier to add.
 
-Provisions a Linode instance and sets up an Open Source Chef Server as
+Provisions a Digital Ocean droplet and sets up an Open Source Chef Server as
 described [above](#knife-server-bootstrap).
 
-### <a name="knife-server-bootstrap-openstack"></a> knife server bootstrap openstack
+#### Configuration
 
-**Note:** You must install the [knife-openstack gem][knife-openstack] to use this
+This subcommand imports all relavent options from the knife-digital_ocean gem.
+For detailed documentation relating to these options, please visit the [project
+page][knife-digital_ocean].
+
+### <a name="knife-server-bootstrap-linode"></a> knife server bootstrap linode
+
+**Note:** You must install the [knife-linode gem][knife-linode] to use this
 subcommand. This was done to keep the dependencies of this library lighter and
 to make future cloud adapter support easier to add.
 
-Provisions a Openstack instance and sets up an Open Source Chef Server as
+Provisions a Linode instance and sets up an Open Source Chef Server as
 described [above](#knife-server-bootstrap).
 
 #### Configuration
@@ -478,6 +508,15 @@ password so that you know how to connect later.
 
 The default value is a random password.
 
+### <a name="knife-server-bootstrap-openstack"></a> knife server bootstrap openstack
+
+**Note:** You must install the [knife-openstack gem][knife-openstack] to use this
+subcommand. This was done to keep the dependencies of this library lighter and
+to make future cloud adapter support easier to add.
+
+Provisions a Openstack instance and sets up an Open Source Chef Server as
+described [above](#knife-server-bootstrap).
+
 ### <a name="knife-server-bootstrap-standalone"></a> knife server bootstrap standalone
 
 Provisions a standalone server that is reachable on the network and sets up
@@ -636,11 +675,13 @@ Apache License, Version 2.0 (see [LICENSE][license])
 [backup_restore]:           https://github.com/stevendanna/knife-hacks/blob/master/plugins/backup_restore.rb
 [chef_bootstrap_knife_rb]:  https://github.com/fnichol/chef-bootstrap-repo/blob/master/.chef/knife.rb
 [chef_bootstrap_repo]:      https://github.com/fnichol/chef-bootstrap-repo/
+[do_site]:                  https://www.digitalocean.com/
 [docs_knife]:               http://docs.opscode.com/config_rb_knife.html
 [docs_knife_ec2]:           http://docs.opscode.com/plugin_knife_ec2.html
 [docs_knife_linode]:        http://docs.opscode.com/plugin_knife_linode.html
 [jtimberman]:               https://github.com/jtimberman
 [install_chef]:             http://www.opscode.com/chef/install/
+[knife-digital_ocean]:      https://github.com/rmoriz/knife-digital_ocean
 [knife-ec2]:                https://github.com/opscode/knife-ec2
 [knife-linode]:             https://github.com/opscode/knife-linode
 [knife-openstack]:          https://github.com/opscode/knife-openstack

data/knife-server.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "chef",      ">= 0.10.10"
 
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "knife-digital_ocean"
   gem.add_development_dependency "knife-ec2", ">= 0.5.12"
   gem.add_development_dependency "knife-linode"
   gem.add_development_dependency "knife-openstack"

data/lib/chef/knife/server_bootstrap_digitalocean.rb

@@ -0,0 +1,153 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
+# Copyright:: Copyright (c) 2014 Fletcher Nichol
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "chef/knife/server_bootstrap_base"
+
+class Chef
+  class Knife
+    # Provisions a Digital Ocean instance and sets up an Open Source Chef
+    # Server.
+    class ServerBootstrapDigitalocean < Knife
+
+      banner "knife server bootstrap digitalocean (options)"
+
+      include Knife::ServerBootstrapBase
+
+      deps do
+        require "knife/server/ssh"
+        require "knife/server/credentials"
+
+        begin
+          require "chef/knife/digital_ocean_droplet_create"
+          require "fog"
+          Chef::Knife::DigitalOceanDropletCreate.load_deps
+
+          current_options = options
+          self.options = Chef::Knife::DigitalOceanDropletCreate.options.dup
+          options.merge!(current_options)
+        rescue LoadError => ex
+          ui.error [
+            "Knife plugin knife-digital_ocean could not be loaded.",
+            "Please add the knife-digital_ocean gem to your Gemfile or",
+            "install the gem manually with `gem install knife-digital_ocean'.",
+            "(#{ex.message})"
+          ].join(" ")
+          exit 1
+        end
+
+        # Monkey patch to prevent Kernel#exit calls at the end of the upstream
+        # Knife plugin. Instead, non-zero exits will be raised and zero exits
+        # will be ignored ;)
+        #
+        # rubocop:disable Style/ClassAndModuleChildren
+        class ::Chef::Knife::DigitalOceanDropletCreate
+          def exit(code)
+            if code != 0
+              raise "DigitalOceanDropletCreate exited with code: #{code}"
+            end
+          end
+        end
+        # rubocop:enable Style/ClassAndModuleChildren
+      end
+
+      option :chef_node_name,
+        :short => "-N NAME",
+        :long => "--node-name NAME",
+        :description => "The Chef node name for your new node",
+        :proc => proc { |key| Chef::Config[:knife][:server_name] = key }
+
+      def run
+        super
+        digital_ocean_bootstrap.run
+        fetch_validation_key
+        create_root_client
+        install_client_key
+      end
+
+      def digital_ocean_bootstrap
+        setup_environment
+        bootstrap = Chef::Knife::DigitalOceanDropletCreate.new
+        bootstrap.config[:bootstrap] = true
+        Chef::Knife::DigitalOceanDropletCreate.options.keys.each do |attr|
+          val = config_val(attr)
+          next if val.nil?
+
+          bootstrap.config[attr] = val
+        end
+        bootstrap.config[:server_name] = config_val(:chef_node_name)
+        bootstrap.config[:distro] = bootstrap_distro
+        bootstrap
+      end
+
+      def digital_ocean_connection
+        @digital_ocean_connection ||= Fog::Compute.new(
+          :provider => "DigitalOcean",
+          :digitalocean_client_id => config_val(:digital_ocean_client_id),
+          :digitalocean_api_key => config_val(:digital_ocean_api_key)
+        )
+      end
+
+      def server_ip_address
+        server = digital_ocean_connection.servers.find do |s|
+          s.state == "active" && s.name == config_val(:chef_node_name)
+        end
+
+        server && server.public_ip_address
+      end
+
+      private
+
+      def validate!
+        super
+
+        if config[:chef_node_name].nil?
+          ui.error "You did not provide a valid --node-name value."
+          exit 1
+        end
+        if config_val(:platform) == "auto"
+          ui.error "Auto platform mode cannot be used with " \
+            "knife-digital_ocean plugin"
+          exit 1
+        end
+      end
+
+      def setup_environment
+        ENV["WEBUI_PASSWORD"] = config_val(:webui_password)
+        ENV["AMQP_PASSWORD"] = config_val(:amqp_password)
+        ENV["NO_TEST"] = "1" if config[:no_test]
+      end
+
+      def ssh_connection
+        opts = {
+          :host     => server_ip_address,
+          :user     => config_val(:ssh_user),
+          :port     => "22",
+          :keys     => [config_val(:identity_file)].compact,
+          :password => config_val(:ssh_password)
+        }
+        if config_val(:host_key_verify) == false
+          opts[:user_known_hosts_file] = "/dev/null"
+          opts[:paranoid] = false
+        end
+
+        ::Knife::Server::SSH.new(opts)
+      end
+    end
+  end
+end

data/lib/knife/server/version.rb

@@ -19,6 +19,6 @@
 
 module Knife
   module Server
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

data/spec/chef/knife/server_bootstrap_digitalocean_spec.rb

@@ -0,0 +1,317 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
+# Copyright:: Copyright (c) 2014 Fletcher Nichol
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "chef/knife/server_bootstrap_digitalocean"
+require "chef/knife/ssh"
+require "fakefs/spec_helpers"
+require "net/ssh"
+Chef::Knife::ServerBootstrapDigitalocean.load_deps
+
+describe Chef::Knife::ServerBootstrapDigitalocean do
+  include FakeFS::SpecHelpers
+
+  before do
+    Chef::Log.logger = Logger.new(StringIO.new)
+    @knife = Chef::Knife::ServerBootstrapDigitalocean.new
+    @stdout = StringIO.new
+    allow(@knife.ui).to receive(:stdout).and_return(@stdout)
+    @stderr = StringIO.new
+    allow(@knife.ui).to receive(:stderr).and_return(@stderr)
+    @knife.config[:chef_node_name] = "yakky"
+    @knife.config[:platform] = "omnibus"
+    @knife.config[:ssh_user] = "root"
+  end
+
+  let(:connection) { double(Fog::Compute::AWS) }
+
+  describe "#digital_ocean_bootstrap" do
+
+    before do
+      @knife.config[:chef_node_name] = "shave.yak"
+      @knife.config[:ssh_user] = "jdoe"
+      @knife.config[:identity_file] = "~/.ssh/mykey_dsa"
+      @knife.config[:digital_ocean_client_id] = "clientxyz"
+      @knife.config[:digital_ocean_api_key] = "do123"
+      @knife.config[:distro] = "distro-praha"
+      @knife.config[:webui_password] = "daweb"
+      @knife.config[:amqp_password] = "queueitup"
+
+      ENV["_SPEC_WEBUI_PASSWORD"] = ENV["WEBUI_PASSWORD"]
+      ENV["_SPEC_AMQP_PASSWORD"] = ENV["AMQP_PASSWORD"]
+    end
+
+    after do
+      ENV["WEBUI_PASSWORD"] = ENV.delete("_SPEC_WEBUI_PASSWORD")
+      ENV["AMQP_PASSWORD"] = ENV.delete("_SPEC_AMQP_PASSWORD")
+    end
+
+    let(:bootstrap) { @knife.digital_ocean_bootstrap }
+
+    it "returns a DitialOceanDropletCreate instance" do
+      expect(bootstrap).to be_a(Chef::Knife::DigitalOceanDropletCreate)
+    end
+
+    it "configs the bootstrap's server_name" do
+      expect(bootstrap.config[:server_name]).to eq("shave.yak")
+    end
+
+    it "configs the bootstrap's ssh_user" do
+      expect(bootstrap.config[:ssh_user]).to eq("jdoe")
+    end
+
+    it "configs the bootstrap's identity_file" do
+      expect(bootstrap.config[:identity_file]).to eq("~/.ssh/mykey_dsa")
+    end
+
+    it "configs the bootstrap's digital_ocean_client_id" do
+      expect(bootstrap.config[:digital_ocean_client_id]).to eq("clientxyz")
+    end
+
+    it "configs the bootstrap's digital_ocean_api_key" do
+      expect(bootstrap.config[:digital_ocean_api_key]).to eq("do123")
+    end
+
+    it "configs the bootstrap's distro" do
+      expect(bootstrap.config[:distro]).to eq("distro-praha")
+    end
+
+    it "configs the bootstrap's distro to chef11/omnibus by default" do
+      @knife.config.delete(:distro)
+
+      expect(bootstrap.config[:distro]).to eq("chef11/omnibus")
+    end
+
+    it "configs the bootstrap's distro value driven off platform value" do
+      @knife.config.delete(:distro)
+      @knife.config[:platform] = "freebsd"
+
+      expect(bootstrap.config[:distro]).to eq("chef11/freebsd")
+    end
+
+    it "configs the distro based on bootstrap_version and platform" do
+      @knife.config.delete(:distro)
+      @knife.config[:platform] = "freebsd"
+      @knife.config[:bootstrap_version] = "10"
+
+      expect(bootstrap.config[:distro]).to eq("chef10/freebsd")
+    end
+
+    it "configs the bootstrap's ENV with the webui password" do
+      bootstrap
+
+      expect(ENV["WEBUI_PASSWORD"]).to eq("daweb")
+    end
+
+    it "configs the bootstrap's ENV with the amqp password" do
+      bootstrap
+
+      expect(ENV["AMQP_PASSWORD"]).to eq("queueitup")
+    end
+
+    it "configs the bootstrap flag to true" do
+      expect(bootstrap.config[:bootstrap]).to eq(true)
+    end
+
+    it "skips config values with nil defaults" do
+      expect(bootstrap.config[:bootstrap_version]).to be_nil
+    end
+  end
+
+  describe "#digital_ocean_connection" do
+
+    before do
+      @before_config = Hash.new
+      @before_config[:knife] = Hash.new
+      [:digital_ocean_client_id, :digital_ocean_api_key].each do |key|
+        @before_config[:knife][key] = Chef::Config[:knife][key]
+      end
+
+      Chef::Config[:knife][:digital_ocean_client_id] = "client"
+      Chef::Config[:knife][:digital_ocean_api_key] = "api"
+    end
+
+    after do
+      [:digital_ocean_client_id, :digital_ocean_api_key].each do |key|
+        Chef::Config[:knife][key] = @before_config[:knife][key]
+      end
+    end
+
+    it "constructs a connection" do
+      expect(Fog::Compute).to receive(:new).with(
+        :provider => "DigitalOcean",
+        :digitalocean_client_id => "client",
+        :digitalocean_api_key => "api"
+      )
+
+      @knife.digital_ocean_connection
+    end
+  end
+
+  describe "#server_ip_address" do
+
+    before do
+      @knife.config[:chef_node_name] = "yak"
+      allow(@knife).to receive(:digital_ocean_connection) { connection }
+    end
+
+    context "when server is found" do
+
+      before do
+        allow(connection).to receive(:servers) { [server] }
+      end
+
+      let(:server) do
+        double(
+          :name => "yak",
+          :state => "active",
+          :public_ip_address => "10.11.12.13"
+        )
+      end
+
+      it "returns the provisioned ip address" do
+        expect(@knife.server_ip_address).to eq("10.11.12.13")
+      end
+
+      it "ignores terminated instances" do
+        allow(server).to receive(:state) { "foobar" }
+
+        expect(@knife.server_ip_address).to be_nil
+      end
+    end
+
+    context "when server is not found" do
+      before do
+        allow(connection).to receive(:servers) { [] }
+      end
+
+      it "returns nil" do
+        expect(@knife.server_ip_address).to be_nil
+      end
+    end
+  end
+
+  describe "#run" do
+
+    before do
+      @before_config = Hash.new
+      [:node_name, :client_key].each do |attr|
+        @before_config[attr] = Chef::Config[attr]
+      end
+      Chef::Config[:node_name] = "smithers"
+      Chef::Config[:client_key] = "/var/tmp/myclientkey.pem"
+
+      @knife.config[:validation_key] = "/var/tmp/validation.pem"
+      @knife.config[:identity_file] = "~/.ssh/mykey_dsa"
+      @knife.config[:ssh_password] = "booboo"
+      allow(@knife).to receive(:digital_ocean_connection)  { connection }
+      allow(@knife).to receive(:server_ip_address)  { "11.11.11.13" }
+      allow(Chef::Knife::DigitalOceanDropletCreate).to receive(:new) do
+        bootstrap
+      end
+      allow(Knife::Server::SSH).to receive(:new) { ssh }
+      allow(Knife::Server::Credentials).to receive(:new) { credentials }
+      allow(credentials).to receive(:install_validation_key)
+      allow(credentials).to receive(:create_root_client)
+    end
+
+    after do
+      [:node_name, :client_key].each do |attr|
+        Chef::Config[attr] = @before_config[attr]
+      end
+    end
+
+    let(:bootstrap)   { double(:run => true, :config => Hash.new) }
+    let(:ssh)         { double }
+    let(:credentials) { double.as_null_object }
+
+    it "exits if Chef::Config[:node_name] is missing" do
+      Chef::Config[:node_name] = nil
+
+      expect { @knife.run }.to raise_error SystemExit
+    end
+
+    it "exits if Chef::Config[:client_key] is missing" do
+      Chef::Config[:client_key] = nil
+
+      expect { @knife.run }.to raise_error SystemExit
+    end
+
+    it "exits if node_name option is missing" do
+      @knife.config.delete(:chef_node_name)
+
+      expect { @knife.run }.to raise_error(SystemExit)
+    end
+
+    it "exits if platform is set to auto" do
+      @knife.config[:platform] = "auto"
+
+      expect { @knife.run }.to raise_error(SystemExit)
+    end
+
+    it "bootstraps a digital ocean server" do
+      expect(bootstrap).to receive(:run)
+
+      @knife.run
+    end
+
+    it "installs a new validation.pem key from the chef 10 server" do
+      @knife.config[:bootstrap_version] = "10"
+      expect(Knife::Server::SSH).to receive(:new).with(
+        :host => "11.11.11.13",
+        :user => "root",
+        :port => "22",
+        :keys => ["~/.ssh/mykey_dsa"],
+        :password => "booboo"
+      )
+      expect(Knife::Server::Credentials).to receive(:new).
+        with(ssh, "/etc/chef/validation.pem", {})
+      expect(credentials).to receive(:install_validation_key)
+
+      @knife.run
+    end
+
+    it "installs a new validation.pem key from the omnibus server" do
+      expect(Knife::Server::SSH).to receive(:new).with(
+        :host => "11.11.11.13",
+        :user => "root",
+        :port => "22",
+        :keys => ["~/.ssh/mykey_dsa"],
+        :password => "booboo"
+      )
+      expect(Knife::Server::Credentials).to receive(:new).
+        with(ssh, "/etc/chef/validation.pem", :omnibus => true)
+      expect(credentials).to receive(:install_validation_key)
+
+      @knife.run
+    end
+
+    it "create a root client key" do
+      expect(credentials).to receive(:create_root_client)
+
+      @knife.run
+    end
+
+    it "installs a client key" do
+      expect(credentials).to receive(:install_client_key).
+        with("smithers", "/var/tmp/myclientkey.pem")
+
+      @knife.run
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-server
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: knife-digital_ocean
+  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-ec2
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +236,7 @@ files:
 - lib/chef/knife/bootstrap/chef11/rhel.erb
 - lib/chef/knife/server_backup.rb
 - lib/chef/knife/server_bootstrap_base.rb
+- lib/chef/knife/server_bootstrap_digitalocean.rb
 - lib/chef/knife/server_bootstrap_ec2.rb
 - lib/chef/knife/server_bootstrap_linode.rb
 - lib/chef/knife/server_bootstrap_openstack.rb
@@ -233,6 +248,7 @@ files:
 - lib/knife/server/ssh.rb
 - lib/knife/server/version.rb
 - spec/chef/knife/server_backup_spec.rb
+- spec/chef/knife/server_bootstrap_digitalocean_spec.rb
 - spec/chef/knife/server_bootstrap_ec2_spec.rb
 - spec/chef/knife/server_bootstrap_linode_spec.rb
 - spec/chef/knife/server_bootstrap_openstack_spec.rb
@@ -266,6 +282,7 @@ specification_version: 4
 summary: Chef Knife plugin to bootstrap Chef Servers
 test_files:
 - spec/chef/knife/server_backup_spec.rb
+- spec/chef/knife/server_bootstrap_digitalocean_spec.rb
 - spec/chef/knife/server_bootstrap_ec2_spec.rb
 - spec/chef/knife/server_bootstrap_linode_spec.rb
 - spec/chef/knife/server_bootstrap_openstack_spec.rb