knife-server 0.3.0 → 0.3.1

data/CHANGELOG.md

@@ -1,4 +1,22 @@
-## 0.3.1.dev (unreleased)
+## 0.3.2.dev (unreleased)
+
+
+## 0.3.1 (December 12, 2012)
+
+### Bug fixes
+
+* Pull request [#7](https://github.com/fnichol/knife-server/pull/11): Fix
+  identity-file flag for bootstrapping. ([@xdissent][])
+* Pull request [#11](https://github.com/fnichol/knife-server/pull/11): Fix
+  identity-file flag for EC2 bootstrapping. ([@erikh][])
+* Pull request [#8](https://github.com/fnichol/knife-server/pull/8): Merge
+  server config to Ec2ServerCreate config. ([@stormsilver][])
+
+### Improvements
+
+* Pull request [#3](https://github.com/fnichol/knife-server/pull/3): Set
+  server hostname even if /etc/hostname is not present. ([@iafonov][])
+* Update usage section in README.
 
 
 ## 0.3.0 (July 7, 2012)
@@ -49,5 +67,8 @@
 
 The initial release.
 
+[@erikh]: https://github.com/erikh
 [@fnichol]: https://github.com/fnichol
-
+[@iafonov]: https://github.com/iafonov
+[@stormsilver]: https://github.com/stormsilver
+[@xdissent]: https://github.com/xdissent

data/README.md

@@ -1,4 +1,6 @@
-# <a name="title"></a> Knife::Server [![Build Status](https://secure.travis-ci.org/fnichol/knife-server.png?branch=master)](http://travis-ci.org/fnichol/knife-server) [![Dependency Status](https://gemnasium.com/fnichol/knife-server.png)](https://gemnasium.com/fnichol/knife-server) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/fnichol/knife-server)
+# <a name="title"></a> 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/badge.png)](https://codeclimate.com/github/fnichol/knife-server)
 
 An Opscode Chef knife plugin to manage Chef Servers. Bootstrap a new Chef
 Server on Amazon's EC2 or a standalone server. Backup and restore your Chef
@@ -43,6 +45,20 @@ Restoring all that data isn't too hard either:
 $ knife server restore
 ```
 
+Let's say you have all your roles, environments, and data bags in a Git
+repository (remember, Infrastructure as Code) and you want to build a
+new Chef Server. Try this:
+
+```bash
+$ knife server backup nodes --backup-dir /tmp/old_server
+$ knife server bootstrap ec2 --ssh-user ubuntu \
+  --node-name chef.example.com
+$ knife server restore nodes --backup-dir /tmp/old_server
+```
+
+Now fire up your cookbooks, roles, environments, and data bags. Good to go!
+Well except for old client keys on your nodes, but this is being looked into.
+
 See [below](#subcommands) for more details.
 
 ## <a name="installation"></a> Installation
@@ -379,7 +395,8 @@ When no component types are specified, all will be selected for restore.
 This is equivalent to invoking:
 
 ```bash
-$ knife server restore nodes roles environments data_bags
+$ knife server restore nodes roles environments data_bags \
+  --backup-dir /my/backup/dir
 ```
 
 ##### --backup-dir DIR (-D)

data/lib/chef/knife/bootstrap/chef-server-debian.erb

@@ -29,7 +29,7 @@ set_hostname_for_ubuntu() {
   local host_first="$(echo $hostname | cut -d . -f 1)"
   local hostnames="${hostname} ${host_first}"
 
-  sed -i "s/^.*$/$hostname/" /etc/hostname
+  echo $hostname > /etc/hostname
   if egrep -q "^127.0.1.1[[:space:]]" /etc/hosts >/dev/null ; then
     sed -i "s/^\(127[.]0[.]1[.]1[[:space:]]\+\)/\1${hostnames} /" \
       /etc/hosts

data/lib/chef/knife/server_bootstrap_ec2.rb

@@ -112,9 +112,7 @@ class Chef
         ENV['WEBUI_PASSWORD'] = config[:webui_password]
         ENV['AMQP_PASSWORD'] = config[:amqp_password]
         bootstrap = Chef::Knife::Ec2ServerCreate.new
-        [ :chef_node_name, :ssh_user, :ssh_port, :identity_file,
-          :security_groups, :ebs_size, :webui_password, :amqp_password
-        ].each { |attr| bootstrap.config[attr] = config[attr] }
+        bootstrap.config.merge!(config)
         bootstrap.config[:tags] = bootstrap_tags
         bootstrap.config[:distro] = bootstrap_distro
         bootstrap
@@ -162,7 +160,8 @@ class Chef
         ::Knife::Server::SSH.new(
           :host => server_dns_name,
           :user => config[:ssh_user],
-          :port => config[:ssh_port]
+          :port => config[:ssh_port],
+          :keys => [config[:identity_file]]
         )
       end
     end

data/lib/chef/knife/server_bootstrap_standalone.rb

@@ -92,7 +92,8 @@ class Chef
           :host => config[:host],
           :user => config[:ssh_user],
           :password => config[:ssh_password],
-          :port => config[:ssh_port]
+          :port => config[:ssh_port],
+          :keys => [config[:identity_file]]
         )
       end
     end

data/lib/knife/server/version.rb

@@ -18,6 +18,6 @@
 
 module Knife
   module Server
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/spec/chef/knife/server_bootstrap_ec2_spec.rb

@@ -252,8 +252,10 @@ describe Chef::Knife::ServerBootstrapEc2 do
     end
 
     it "installs a new validation.pem key from the server" do
-      Knife::Server::SSH.should_receive(:new).
-        with({ :host => "grapes.wrath", :user => "root", :port => "2345" })
+      Knife::Server::SSH.should_receive(:new).with({
+        :host => "grapes.wrath", :user => "root",
+        :port => "2345", :keys => ["~/.ssh/mykey_dsa"]
+      })
       Knife::Server::Credentials.should_receive(:new).
         with(ssh, "/etc/chef/validation.pem")
       credentials.should_receive(:install_validation_key)

data/spec/chef/knife/server_bootstrap_standalone_spec.rb

@@ -206,7 +206,7 @@ describe Chef::Knife::ServerBootstrapStandalone do
       it "creates an SSH connection without a password" do
         Knife::Server::SSH.should_receive(:new).with({
           :host => "192.168.0.1", :port => "2345",
-          :user => "root", :password => nil
+          :user => "root", :password => nil, :keys => [nil]
         })
 
         @knife.run
@@ -221,7 +221,22 @@ describe Chef::Knife::ServerBootstrapStandalone do
       it "creates an SSH connection with a password" do
         Knife::Server::SSH.should_receive(:new).with({
           :host => "192.168.0.1", :port => "2345",
-          :user => "root", :password => "snoopy"
+          :user => "root", :password => "snoopy", :keys => [nil]
+        })
+
+        @knife.run
+      end
+    end
+
+    context "when an identity file is provided" do
+      before do
+        @knife.config[:identity_file] = "poop.pem"
+      end
+
+      it "creates an SSH connection with an identity file" do
+        Knife::Server::SSH.should_receive(:new).with({
+          :host => "192.168.0.1", :port => "2345",
+          :user => "root", :password => nil, :keys => ["poop.pem"]
         })
 
         @knife.run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-server
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-07 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &2164645600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2164645600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &2164644960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164644960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &2164644040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 0.10.10
   type: :runtime
   prerelease: false
-  version_requirements: *2164644040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.10
 - !ruby/object:Gem::Dependency
   name: knife-ec2
-  requirement: &2164643320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 0.5.12
   type: :runtime
   prerelease: false
-  version_requirements: *2164643320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.12
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164642520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: '2.10'
   type: :development
   prerelease: false
-  version_requirements: *2164642520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &2164642000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2164642000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2164641520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +117,12 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *2164641520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.5
 description: Chef Knife plugin to bootstrap Chef Servers
 email:
 - fnichol@nichol.ca
@@ -142,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Chef Knife plugin to bootstrap Chef Servers