knife-instance 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d97bde36605b756b970380d6fa8779dd2a7e5c1
-  data.tar.gz: 757e14d913de4161d837762dbecd688e5e1c7743
+  metadata.gz: e1108cde770487cd53011c74291711f9c593375c
+  data.tar.gz: 0e4e27fefd0221b81fdc722750dab95454922179
 SHA512:
-  metadata.gz: f883a6c85ec53e9233642e2724d11cb88dca3606ae0be1f71ce9947972f98d5275dda14a39e676f07b3f71fc54f9fb9bec50aa57789e8d84259a2e21c745c8ef
-  data.tar.gz: 82b9ad60e49b3f56cae9cccf9cdf570f757c31c8a4562be942279ef98e97abf77531c3713e9a1539f4d3a7c25f3df658a2e940a4462b5ccfb7b317cf41b55501
+  metadata.gz: cfe6de0292f46449c9fea20bf894b494b30f8a6a8c78c92bc9c7f4da8805a8ee286327d925cc2388a7c34a1054fbd73836144f64b81ebc98d8f000100e6cec78
+  data.tar.gz: e3bc8be967811ab1ba9d81a07ea7b5d66897de5beb4be532bb4a2096afa11126079c026570b5852f8289b57dbca6287b9ed0b1a0aefa40060cc15df2f33ebc68

data/lib/chef/knife/instance_create.rb

@@ -173,10 +173,15 @@ class Chef
             :user_data                 => config[:without_user_data] ? "" : get_user_data,
             :iam_instance_profile_name => config[:iam_role]
         }
+        server_def[:associate_public_ip] = true if vpc_mode?
 
         server_def
       end
 
+      def vpc_mode?
+        config[:subnet_id]
+      end
+
       def image
         config[:image]
       end
@@ -205,7 +210,14 @@ class Chef
       end
 
       def get_user_data
-        generator = Zest::BootstrapGenerator.new(Chef::Config[:validation_key], Chef::Config[:validation_client_name], Chef::Config[:chef_server_url], @environment, config[:run_list], hostname, @color, @base_domain, config[:encrypted_data_bag_secret])
+        generator = Zest::BootstrapGenerator.new(Chef::Config[:validation_key], Chef::Config[:validation_client_name], Chef::Config[:chef_server_url], config[:encrypted_data_bag_secret],
+          :environment => @environment,
+          :run_list => config[:run_list],
+          :hostname => hostname,
+          :color => @color,
+          :base_domain => @base_domain,
+          :domain => domain
+        )
         generator.generate
       end
     end

data/lib/knife-instance/bootstrap_generator.rb

@@ -3,16 +3,18 @@ module Zest
   class BootstrapGenerator
     CONFIG_FILE_TEMPLATE = File.expand_path 'templates/boot.sh.erb', File.dirname(__FILE__)
 
-    def initialize(validation_key_file, validation_client_name, chef_server_url, environment, run_list, hostname, color, base_domain, encrypted_databag_secret_file)
+    def initialize(validation_key_file, validation_client_name, chef_server_url, encrypted_databag_secret_file, attr = {})
       @validation_client_name = validation_client_name
       @validation_key_file = validation_key_file
       @chef_server_url = chef_server_url
-      @environment = environment
-      @run_list = run_list
-      @hostname = hostname
-      @color = color
-      @base_domain = base_domain
       @encrypted_databag_secret_file = encrypted_databag_secret_file
+
+      @environment = attr[:environment]
+      @run_list = attr[:run_list]
+      @hostname = attr[:hostname]
+      @color = attr[:color]
+      @base_domain = attr[:base_domain]
+      @domain = attr[:domain]
     end
 
     def first_boot
@@ -20,7 +22,8 @@ module Zest
         "run_list"          => @run_list,
         "assigned_hostname" => @hostname,
         "rails"             => {"cluster" => {"color" => @color}},
-        "base_domain"       => @base_domain
+        "base_domain"       => @base_domain,
+        "domain"            => @domain
       }.to_json
     end
 

data/lib/knife-instance/templates/boot.sh.erb

@@ -22,7 +22,8 @@ gem install chef --no-rdoc --no-ri --verbose --version 10.24.0
 gem install tzinfo --no-rdoc --no-ri --verbose --version 0.3.33
 gem install syslog-logger --no-rdoc --no-ri --verbose --version 1.6.8
 
-mkdir -p /etc/chef
+mkdir -p /etc/chef/ohai/hints
+touch /etc/chef/ohai/hints/ec2.json # Tell ohai that it is an EC2 node in VPC
 
 <%# Remember to suppress a newline at the end of an erb statement for keys --> -%>
 

data/lib/knife-instance/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Instance
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

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

@@ -102,8 +102,9 @@ describe Chef::Knife::InstanceCreate do
         end
 
         subject { @instance.create_server_def }
-        its([:security_group_ids]) { should == security_group_ids }
-        its([:subnet_id])          { should == subnet_id }
+        its([:security_group_ids])  { should == security_group_ids }
+        its([:subnet_id])           { should == subnet_id }
+        its([:associate_public_ip]) { should == true }
       end
     end
   end

data/spec/lib/knife-instance/bootstrap_generator_spec.rb

@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+describe Zest::BootstrapGenerator do
+  let(:bootstrap_generator) { described_class.new(validation_key_file, validation_client_name, chef_server_url, encrypted_databag_secret_file, attr) }
+  let(:validation_key_file) { "/path/to/validation_key" }
+  let(:validation_client_name) { "this is the validation client name" }
+  let(:chef_server_url) { "this is the url for the chef server" }
+  let(:encrypted_databag_secret_file) { "/path/to/encrypted_databag_secret_file" }
+  let(:attr) { {
+    :environment => environment,
+    :run_list => run_list,
+    :hostname => hostname,
+    :color => color,
+    :base_domain => base_domain,
+    :domain => domain
+  } }
+  let(:environment) { "this is an environment" }
+  let(:run_list) { "this is a run list" }
+  let(:hostname) { "this is a hostname" }
+  let(:color) { "this is a color" }
+  let(:base_domain) { "this is a base domain" }
+  let(:domain) { "this is a domain" }
+
+  describe "#first_boot" do
+    subject { JSON.parse(bootstrap_generator.first_boot) }
+
+    it "defines the run list" do
+      subject["run_list"].should == "this is a run list"
+    end
+
+    it "assigns the hostname" do
+      subject["assigned_hostname"].should == "this is a hostname"
+    end
+
+    it "contains the cluster color" do
+      subject["rails"]["cluster"]["color"].should == "this is a color"
+    end
+
+    it "contains the base domain" do
+      subject["base_domain"].should == "this is a base domain"
+    end
+
+    it "contains the domain" do
+      subject["domain"].should == "this is a domain"
+    end
+  end
+
+  describe "#validation_key" do
+    subject { bootstrap_generator.validation_key }
+
+    before :each do
+      File.stub(:read).with(validation_key_file).and_return("this is a validation key")
+    end
+
+    it "returns the contents of the validation key file" do
+      subject.should == "this is a validation key"
+    end
+  end
+
+  describe "#encrypted_data_bag_secret" do
+    subject { bootstrap_generator.encrypted_data_bag_secret }
+
+    before :each do
+      File.stub(:read).with(encrypted_databag_secret_file).and_return("this is a encrypted data bag secret")
+    end
+
+    it "returns the contents of the validation key file" do
+      subject.should == "this is a encrypted data bag secret"
+    end
+  end
+
+  describe "#config_content" do
+    subject { bootstrap_generator.config_content }
+
+    it "generates the correct config" do
+      subject.should == <<-CONFIG
+  require 'syslog-logger'
+  Logger::Syslog.class_eval do
+    attr_accessor :sync, :formatter
+  end
+
+  log_level              :info
+  log_location           Logger::Syslog.new("chef-client")
+  chef_server_url        "this is the url for the chef server"
+  validation_client_name "this is the validation client name"
+  node_name              "this is a hostname"
+  CONFIG
+    end
+  end
+
+  describe "#start_chef" do
+    subject { bootstrap_generator.start_chef }
+
+    it "generates the correct chef start command" do
+      subject.should == "/usr/bin/chef-client -j /etc/chef/first-boot.json -E this is an environment"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-instance
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Alexander Tamoykin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -104,6 +104,7 @@ files:
 - lib/knife-instance/version.rb
 - lib/knife-instance/zestknife.rb
 - spec/lib/chef/knife/instance_create_spec.rb
+- spec/lib/knife-instance/bootstrap_generator_spec.rb
 - spec/lib/knife-instance/zestknife_spec.rb
 - spec/spec_helper.rb
 - spec/support/databag.key
@@ -133,6 +134,7 @@ specification_version: 4
 summary: Manage EC2 instances with Chef from the command line
 test_files:
 - spec/lib/chef/knife/instance_create_spec.rb
+- spec/lib/knife-instance/bootstrap_generator_spec.rb
 - spec/lib/knife-instance/zestknife_spec.rb
 - spec/spec_helper.rb
 - spec/support/databag.key