knife-server 1.0.0 → 1.0.1

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
 - 1.9.3
+- 2.0.0
 - 1.9.2
 - ruby-head
 - 1.8.7
-- ree
 
 env:
 - "CHEF_VERSION=11.4.0"

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.0.1 / 2013-04-11
+
+### Bug fixes
+
+* Pull request [#29][]: Fix README typo in ssh password argument. ([@ranjib][])
+* Pull request [#34][]: Fix AMQP_PASSWORD propagation. ([@erikh][])
+
+### Improvement
+
+* Pull request [#35][]: Add VPC support. ([@jssjr][])
+* Pull request [#34][]: Provide better information when the package can't be
+  downloaded. ([@erikh][])
+
+
 ## 1.0.0 / 2013-02-28
 
 ### Breaking Changes
@@ -20,7 +34,7 @@
   Scientific, RHEL, Amazon Linux, etc. Seriously, this is huge. ([@danryan][],
   [@erikh][])
 * Support for installing Chef 11 (erchef) servers from Omnibus packages.
-  ([@fnicho][])
+  ([@fnichol][])
 * Add --log-level flag to help debug bootstrap template output. ([@fnichol][])
 * Support all relevant options from `Chef::Knife::Bootstrap` and
   `Chef::Knife::Ec2ServerCreate` in the standalone and ec2 subcommands. This
@@ -45,39 +59,36 @@
 
 ### Bug fixes
 
-* Pull request [#15](https://github.com/fnichol/knife-server/pull/15): Fix
-  identity-file when `nil` is passed in. ([@erikh][])
+* Pull request [#15][]: Fix identity-file when `nil` is passed in. ([@erikh][])
 
 
 ## 0.3.2 / 2012-12-19
 
 ### Improvements
 
-* Pull request [#13](https://github.com/fnichol/knife-server/pull/13): Relax
-  version constraint on knife-ec2 gem. ([@wpeterson][])
-* Issue [#9](https://github.com/fnichol/knife-server/issues/9): Highlight the
-  need to create set various knife.rb configuration settings. ([@fnichol][])
-* Issue [#10](https://github.com/fnichol/knife-server/issues/10),
-  [#5](https://github.com/fnichol/knife-server/issues/5): Add more
-  instructions in knife.rb setup section as using Knife may be new to many
-  users of this gem. ([@fnichol][])
+* Pull request [#13][]: Relax version constraint on knife-ec2 gem.
+  ([@wpeterson][])
+* Issue [#9][]: Highlight the need to create set various knife.rb
+  configuration settings. ([@fnichol][])
+* Issue [#10][], [#5][]: Add more instructions in knife.rb setup section as
+  using Knife may be new to many users of this gem. ([@fnichol][])
 
 
 ## 0.3.1 / 2012-12-12
 
 ### 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][])
+* Pull request [#7][]: Fix identity-file flag for bootstrapping.
+  ([@xdissent][])
+* Pull request [#11][]: Fix identity-file flag for EC2 bootstrapping.
+  ([@erikh][])
+* Pull request [#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][])
+* Pull request [#3][]: Set server hostname even if /etc/hostname is not
+  present. ([@iafonov][])
 * Update usage section in README.
 
 
@@ -114,9 +125,8 @@
 
 ### Bug fixes
 
-* Issue [#2](https://github.com/fnichol/knife-server/issues/2): Improve
-  documentation to clarify `knife server bootstrap` is not a proper
-  subcommand. ([@fnichol][])
+* Issue [#2][]: Improve documentation to clarify `knife server bootstrap` is
+  not a proper subcommand. ([@fnichol][])
 
 ### New features
 
@@ -129,10 +139,27 @@
 
 The initial release.
 
+
+<!--- The following link definition list is generated by PimpMyChangelog --->
+[#2]: https://github.com/fnichol/knife/issues/2
+[#3]: https://github.com/fnichol/knife/issues/3
+[#5]: https://github.com/fnichol/knife/issues/5
+[#7]: https://github.com/fnichol/knife/issues/7
+[#8]: https://github.com/fnichol/knife/issues/8
+[#9]: https://github.com/fnichol/knife/issues/9
+[#10]: https://github.com/fnichol/knife/issues/10
+[#11]: https://github.com/fnichol/knife/issues/11
+[#13]: https://github.com/fnichol/knife/issues/13
+[#15]: https://github.com/fnichol/knife/issues/15
+[#29]: https://github.com/fnichol/knife/issues/29
+[#34]: https://github.com/fnichol/knife/issues/34
+[#35]: https://github.com/fnichol/knife/issues/35
 [@danryan]: https://github.com/danryan
 [@erikh]: https://github.com/erikh
 [@fnichol]: https://github.com/fnichol
 [@iafonov]: https://github.com/iafonov
+[@jssjr]: https://github.com/jssjr
+[@ranjib]: https://github.com/ranjib
 [@stormsilver]: https://github.com/stormsilver
 [@wpeterson]: https://github.com/wpeterson
 [@xdissent]: https://github.com/xdissent

data/README.md

@@ -52,7 +52,7 @@ $ knife server bootstrap standalone \
   --node-name chefapalooza.example.com \
   --host 192.168.33.10 \
   --ssh-user vagrant \
-  --ssh--password vagrant
+  --ssh-password vagrant
 ```
 
 Taking a backup of all node, role, data bag, and environment data is also a

data/knife-server.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rspec", "~> 2.10"
   gem.add_development_dependency "fakefs", "~> 0.4.0"
-  gem.add_development_dependency "timecop", "~> 0.3.5"
+  gem.add_development_dependency "timecop", "~> 0.3"
 end

data/lib/chef/knife/bootstrap/_common.sh

@@ -12,6 +12,7 @@ report_bug() {
   warn "Please file a bug report at https://github.com/fnichol/knife-server/issues"
   warn " "
   warn "Please detail your operating system, version and any other relevant details"
+  echo
 }
 
 exists() {

data/lib/chef/knife/bootstrap/_omnibus.sh

@@ -30,6 +30,23 @@ rpm_filename() {
   filename="chef-${version}.${machine}.rpm"
 }
 
+failed_download() {
+  warn "We encountered an error downloading the package."
+  echo
+  exit 5
+}
+
+perform_download() {
+  case "$1" in
+    wget)
+      wget -O "$2" "$3" 2>/tmp/stderr || failed_download
+    ;;
+    curl)
+      curl -L "$3" > "$2" || failed_download
+    ;;
+  esac
+}
+
 download_package() {
   if [ -f "/opt/chef-server/bin/chef-server-ctl" ] ; then
     info "Chef Server detected in /opt/chef-server, skipping download"
@@ -39,16 +56,18 @@ download_package() {
   local url="$(package_url)"
 
   banner "Downloading Chef Server package from $url to $tmp_dir/$filename"
+
   if exists wget;
   then
-    wget -O "$tmp_dir/$filename" $url 2>/tmp/stderr
+    perform_download wget "$tmp_dir/$filename" $url
   elif exists curl;
   then
-    curl -L $url > "$tmp_dir/$filename"
+    perform_download curl "$tmp_dir/$filename" $url
   else
     warn "Cannot find wget or curl - cannot install Chef Server!"
     exit 5
   fi
+
   info "Download complete"
 }
 

data/lib/chef/knife/bootstrap/chef10/debian.erb

@@ -1,4 +1,4 @@
-bash -c '
+bash <<'EOS'
 <%
   require 'erb'
 
@@ -45,7 +45,7 @@ add_opscode_apt_repo() {
   apt-get update
   # permanent upgradeable keyring
   apt-get install -y --force-yes opscode-keyring
-  apt-get upgrade -y
+  apt-get dist-upgrade -y
 }
 
 preseed_chef_pkg() {
@@ -64,7 +64,8 @@ PRESEED
 install_chef_server() {
   preseed_chef_pkg
 
-  apt-get install -y --force-yes chef chef-server libshadow-ruby1.8
+  apt-get update
+  apt-get install -y chef chef-server libshadow-ruby1.8
 }
 
 config_chef_solo() {
@@ -105,5 +106,5 @@ add_opscode_apt_repo
 install_chef_server
 enable_ssl_proxy
 
-banner "Bootstraping Chef Server on ${hostname} is complete."
-'
+banner "Bootstrapping Chef Server on ${hostname} is complete."
+EOS

data/lib/chef/knife/bootstrap/chef10/rhel.erb

@@ -181,5 +181,5 @@ set_hostname_for_${platform}
 install_chef_server
 configure_firewall
 
-printf -- "-----> Bootstraping Chef Server on ${hostname} is complete.\n"
+printf -- "-----> Bootstrapping Chef Server on ${hostname} is complete.\n"
 '

data/lib/chef/knife/bootstrap/chef11/omnibus.erb

@@ -25,6 +25,7 @@ export prerelease="<%= @config[:prerelease] == true %>"
 export webui_enable="<%= @chef_config[:knife][:webui_enable] == true %>"
 export webui_password="<%= ENV['WEBUI_PASSWORD'] %>"
 export amqp_password="<%= ENV['AMQP_PASSWORD'] %>"
+export no_test="<%= ENV['NO_TEST'] %>"
 
 <%= render "common.sh" %>
 
@@ -57,8 +58,11 @@ install_package
 prepare_chef_server_rb
 symlink_binaries
 reconfigure_chef_server
-test_chef_server
+if [ ! -n "$no_test"]
+then
+  test_chef_server
+fi
 configure_firewall
 
-banner "Bootstraping Chef Server on ${hostname} is complete."
+banner "Bootstrapping Chef Server on ${hostname} is complete."
 '

data/lib/chef/knife/bootstrap/chef11/rhel.erb

@@ -138,5 +138,5 @@ run_chef_solo
 configure_firewall
 cleanup
 
-echo "-----> Bootstraping Chef Server on ${hostname} is complete."
+echo "-----> Bootstrapping Chef Server on ${hostname} is complete."
 '

data/lib/chef/knife/server_bootstrap_base.rb

@@ -73,6 +73,11 @@ class Chef
             :description  => "Set the log level (debug, info, warn, error, fatal)",
             :proc => Proc.new { |v| Chef::Config[:knife][:log_level] = v.to_sym },
             :default => :error
+
+          option :no_test,
+            :short => "-n",
+            :long => "--no-test",
+            :description => "Do not run opscode pedant as a part of the omnibus installation"
         end
       end
 

data/lib/chef/knife/server_bootstrap_ec2.rb

@@ -67,8 +67,9 @@ class Chef
       end
 
       def ec2_bootstrap
-        ENV['WEBUI_PASSWORD'] = config[:webui_password]
-        ENV['AMQP_PASSWORD'] = config[:amqp_password]
+        ENV['WEBUI_PASSWORD'] = config_val(:webui_password)
+        ENV['AMQP_PASSWORD'] = config_val(:amqp_password)
+        ENV['NO_TEST'] = "1" if config[:no_test]
         bootstrap = Chef::Knife::Ec2ServerCreate.new
         Chef::Knife::Ec2ServerCreate.options.keys.each do |attr|
           bootstrap.config[attr] = config_val(attr)
@@ -111,10 +112,13 @@ class Chef
       end
 
       def config_security_group(name = nil)
-        name = config_val(:security_groups).first if name.nil?
-
-        ::Knife::Server::Ec2SecurityGroup.new(ec2_connection, ui).
-          configure_chef_server_group(name, :description => "#{name} group")
+        if config[:security_group_ids].nil? || config[:security_group_ids].empty?
+          name = config_val(:security_groups).first if name.nil?
+          ::Knife::Server::Ec2SecurityGroup.new(ec2_connection, ui).
+            configure_chef_server_group(name, :description => "#{name} group")
+        else
+          config[:security_groups] = nil
+        end
       end
 
       def bootstrap_tags

data/lib/chef/knife/server_bootstrap_standalone.rb

@@ -52,13 +52,15 @@ class Chef
       end
 
       def standalone_bootstrap
-        ENV['WEBUI_PASSWORD'] = config[:webui_password]
-        ENV['AMQP_PASSWORD'] = config[:amqp_password]
+        ENV['WEBUI_PASSWORD'] = config_val(:webui_password)
+        ENV['AMQP_PASSWORD'] = config_val(:amqp_password)
+        ENV['NO_TEST'] = "1" if config[:no_test]
         bootstrap = Chef::Knife::Bootstrap.new
         bootstrap.name_args = [ config[:host] ]
         Chef::Knife::Bootstrap.options.keys.each do |attr|
           bootstrap.config[attr] = config_val(attr)
         end
+        bootstrap.ui = self.ui
         bootstrap.config[:distro] = bootstrap_distro
         bootstrap.config[:use_sudo] = true unless config_val(:ssh_user) == "root"
         bootstrap

data/lib/knife/server/version.rb

@@ -18,6 +18,6 @@
 
 module Knife
   module Server
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/spec/chef/knife/server_bootstrap_standalone_spec.rb

@@ -107,6 +107,17 @@ describe Chef::Knife::ServerBootstrapStandalone do
       bootstrap.should be_a(Chef::Knife::Bootstrap)
     end
 
+    it "copies our UI object to the bootstrap object" do
+      bootstrap.ui.object_id.should eq(@knife.ui.object_id)
+    end
+
+    it "sets NO_TEST in the environment when the option is provided" do
+      @knife.config[:no_test] = true
+      bootstrap.should_not be_nil
+      ENV["NO_TEST"].should eq("1")
+      ENV.delete("NO_TEST")
+    end
+
     it "configs the bootstrap's chef_node_name" do
       bootstrap.config[:chef_node_name].should eq("shave.yak")
     end
@@ -209,7 +220,7 @@ describe Chef::Knife::ServerBootstrapStandalone do
     end
 
     let(:bootstrap) do
-      stub(:run => true, :config => Hash.new, :name_args= => true)
+      stub(:run => true, :config => Hash.new, :ui= => true, :name_args= => true)
     end
 
     let(:ssh)         { stub(:exec! => true) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-server
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: '0.3'
 description: Chef Knife plugin to bootstrap Chef Servers
 email:
 - fnichol@nichol.ca
@@ -179,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2065345583583086223
+      hash: -2573931868041806838
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2065345583583086223
+      hash: -2573931868041806838
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24