knife-server 0.3.3 → 1.0.0

data/spec/chef/knife/server_bootstrap_standalone_spec.rb

@@ -33,9 +33,51 @@ describe Chef::Knife::ServerBootstrapStandalone do
     @stderr = StringIO.new
     @knife.ui.stub!(:stderr).and_return(@stderr)
     @knife.config[:chef_node_name] = "yakky"
+    @knife.config[:ssh_user] = "root"
+  end
+
+  describe "distro selection" do
+
+    before do
+      @knife.config[:bootstrap_version] = "10"
+      @knife.stub(:determine_platform) { @knife.send(:distro_auto_map, "debian", "6") }
+      @knife.config[:platform] = "auto"
+    end
+
+    it "should auto-select from determine_platform by default" do
+      @knife.config.delete(:distro)
+      @knife.send(:bootstrap_distro).should eq("chef10/debian")
+      @knife.stub(:determine_platform) { "chef10/rhel" }
+      @knife.send(:bootstrap_distro).should eq("chef10/rhel")
+    end
+
+    it "should construct the distro path based on the chef server version and platform" do
+      @knife.send(:construct_distro, "rhel").should eq("chef10/rhel")
+      @knife.config[:bootstrap_version] = "11"
+      @knife.send(:construct_distro, "rhel").should eq("chef11/rhel")
+    end
+
+    it "should map the distro template based on a tuple of (platform, platform_version)" do
+      {
+        "el" => "rhel",
+        "redhat" => "rhel",
+        "debian" => "debian",
+        "ubuntu" => "debian",
+        "solaris2" => "solaris",
+        "solaris" => "solaris",
+        "sles" => "suse",
+        "suse" => "suse"
+      }.each do |key, value|
+        @knife.config[:bootstrap_version] = "10"
+        @knife.send(:distro_auto_map, key, 0).should eq("chef10/#{value}")
+        @knife.config[:bootstrap_version] = "11"
+        @knife.send(:distro_auto_map, key, 0).should eq("chef11/#{value}")
+      end
+    end
   end
 
   describe "#standalone_bootstrap" do
+
     before do
       @knife.config[:host] = "172.0.10.21"
       @knife.config[:chef_node_name] = "shave.yak"
@@ -95,17 +137,17 @@ describe Chef::Knife::ServerBootstrapStandalone do
       bootstrap.config[:distro].should eq("distro-praha")
     end
 
-    it "configs the bootstrap's distro to chef-server-debian by default" do
+    it "configs the bootstrap's distro to chef11/omnibus by default" do
       @knife.config.delete(:distro)
 
-      bootstrap.config[:distro].should eq("chef-server-debian")
+      bootstrap.config[:distro].should eq("chef11/omnibus")
     end
 
     it "configs the bootstrap's distro value driven off platform value" do
       @knife.config.delete(:distro)
       @knife.config[:platform] = "freebsd"
 
-      bootstrap.config[:distro].should eq("chef-server-freebsd")
+      bootstrap.config[:distro].should eq("chef11/freebsd")
     end
 
     it "configs the bootstrap's ENV with the webui password" do
@@ -131,6 +173,15 @@ describe Chef::Knife::ServerBootstrapStandalone do
 
       bootstrap.config[:use_sudo].should_not be_true
     end
+
+    describe "#bootstrap_auto?" do
+      it "should always be true if it was set via --platform, even if the distro changes" do
+        @knife.config[:platform] = "auto"
+        bootstrap.config[:distro].should_not eq("auto")
+        @knife.send(:bootstrap_auto?).should be_true
+      end
+    end
+
   end
 
   describe "#run" do
@@ -194,9 +245,19 @@ describe Chef::Knife::ServerBootstrapStandalone do
       @knife.run
     end
 
-    it "installs a new validation.pem key from the server" do
+    it "installs a new validation.pem key from the chef 10 server" do
+      @knife.config[:bootstrap_version] = "10"
+      @knife.config[:distro] = "yabba-debian"
+      Knife::Server::Credentials.should_receive(:new).
+        with(ssh, "/etc/chef/validation.pem", {})
+      credentials.should_receive(:install_validation_key)
+
+      @knife.run
+    end
+
+    it "installs a new validation.pem key from the omnibus server" do
       Knife::Server::Credentials.should_receive(:new).
-        with(ssh, "/etc/chef/validation.pem")
+        with(ssh, "/etc/chef/validation.pem", {:omnibus => true})
       credentials.should_receive(:install_validation_key)
 
       @knife.run

data/spec/knife/server/credientials_spec.rb

@@ -30,16 +30,28 @@ describe Knife::Server::Credentials do
     Knife::Server::Credentials.new(ssh, validation_key_path)
   end
 
+  let(:omnibus_subject) do
+    Knife::Server::Credentials.new(ssh, validation_key_path, :omnibus => true)
+  end
+
   before do
     FileUtils.mkdir_p(File.dirname(validation_key_path))
     FileUtils.mkdir_p(File.dirname(client_key_path))
     File.new(validation_key_path, "wb")  { |f| f.write("thekey") }
     File.new(client_key_path, "wb")  { |f| f.write("clientkey") }
+
+    ENV['_SPEC_WEBUI_PASSWORD'] = ENV['WEBUI_PASSWORD']
+  end
+
+  after do
+    ENV['WEBUI_PASSWORD'] = ENV.delete('_SPEC_WEBUI_PASSWORD')
   end
 
   describe "#install_validation_key" do
     before do
       ssh.stub(:exec!).with("cat /etc/chef/validation.pem")  { "newkey" }
+      ssh.stub(:exec!).
+        with("cat /etc/chef-server/chef-validator.pem")  { "omnibuskey" }
     end
 
     it "creates a backup of the existing validation key file" do
@@ -63,6 +75,13 @@ describe Knife::Server::Credentials do
 
       key_str.should eq("newkey")
     end
+
+    it "copies the key back from the omnibus server into validation key file" do
+      omnibus_subject.install_validation_key("old")
+      key_str = File.open("/tmp/validation.pem", "rb") { |f| f.read }
+
+      key_str.should eq("omnibuskey")
+    end
   end
 
   describe "#create_root_client" do
@@ -74,6 +93,21 @@ describe Knife::Server::Credentials do
 
       subject.create_root_client
     end
+
+    it "creates an initial user on the omnibus server" do
+      ENV['WEBUI_PASSWORD'] = 'doowah'
+      ssh.should_receive(:exec!).with([
+        "echo 'doowah' |",
+        'knife configure --initial --server-url http://127.0.0.1:8000',
+        '--user root --repository "" --admin-client-name chef-webui',
+        '--admin-client-key /etc/chef-server/chef-webui.pem',
+        '--validation-client-name chef-validator',
+        '--validation-key /etc/chef-server/chef-validator.pem',
+        '--defaults --yes'
+      ].join(" "))
+
+      omnibus_subject.create_root_client
+    end
   end
 
   describe "#install_client_key" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-server
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -67,7 +67,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.12
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -139,7 +139,15 @@ files:
 - README.md
 - Rakefile
 - knife-server.gemspec
-- lib/chef/knife/bootstrap/chef-server-debian.erb
+- lib/chef/knife/bootstrap/_common.sh
+- lib/chef/knife/bootstrap/_omnibus.sh
+- lib/chef/knife/bootstrap/_platform_and_version.sh
+- lib/chef/knife/bootstrap/_set_hostname.sh
+- lib/chef/knife/bootstrap/auto.sh
+- lib/chef/knife/bootstrap/chef10/debian.erb
+- lib/chef/knife/bootstrap/chef10/rhel.erb
+- lib/chef/knife/bootstrap/chef11/omnibus.erb
+- 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_ec2.rb
@@ -171,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -302357605861096338
+      hash: 2065345583583086223
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -180,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -302357605861096338
+      hash: 2065345583583086223
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24