knife-instance 0.1.0 → 0.2.0

checksums.yaml

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

data/lib/chef/knife/instance_create.rb

@@ -40,11 +40,23 @@ class Chef
              :long => "--groups X,Y,Z",
              :description => "The security groups for this server"
 
+      option :security_group_ids,
+             :short => "-g X,Y,Z",
+             :long => "--security-group-ids X,Y,Z",
+             :description => "The security group ids for this server; required when using VPC",
+             :proc => Proc.new { |security_group_ids| security_group_ids.split(',') }
+
       option :availability_zone,
              :short => "-Z ZONE",
              :long => "--availability-zone ZONE",
              :description => "The Availability Zone"
 
+      option :subnet_id,
+             :short => "-s SUBNET-ID",
+             :long => "--subnet SUBNET-ID",
+             :description => "create node in this Virtual Private Cloud Subnet ID (implies VPC mode)",
+             :proc => Proc.new { |key| Chef::Config[:knife][:subnet_id] = key }
+
       option :hostname,
              :short => "-h NAME",
              :long => "--node-name NAME",
@@ -141,21 +153,24 @@ class Chef
           ic.config[:encrypted_data_bag_secret] = opts[:encrypted_data_bag_secret]
           ic.config[:wait_for_it]               = opts[:wait_for_it]
           ic.config[:image]                     = opts[:image]
+          ic.config[:subnet_id]                 = opts[:subnet_id]
         end
       end
 
       def create_server_def
         server_def = {
-            :image_id => image,
-            :groups => security_group,
-            :flavor_id => config[:flavor],
-            :key_name => config[:aws_ssh_key_id],
-            :availability_zone => availability_zone,
+            :image_id           => image,
+            :groups             => config[:security_groups],
+            :security_group_ids => config[:security_group_ids],
+            :flavor_id          => config[:flavor],
+            :key_name           => config[:aws_ssh_key_id],
+            :availability_zone  => availability_zone,
+            :subnet_id          => config[:subnet_id],
             :tags => {
-                'Name' => hostname,
+                'Name'        => hostname,
                 'environment' => @environment
             },
-            :user_data => config[:without_user_data] ? "" : get_user_data,
+            :user_data                 => config[:without_user_data] ? "" : get_user_data,
             :iam_instance_profile_name => config[:iam_role]
         }
 
@@ -166,10 +181,6 @@ class Chef
         config[:image]
       end
 
-      def security_group
-        config[:security_groups]
-      end
-
       def availability_zone
         config[:availability_zone]
       end

data/lib/knife-instance/version.rb

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

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

@@ -91,5 +91,20 @@ describe Chef::Knife::InstanceCreate do
         end
       end
     end
+
+    describe "#create_server_def" do
+      context "VPC specific parameters" do
+        let(:subnet_id) { "subnet-123" }
+        let(:security_group_ids) { ['sg-123', 'sg456'] }
+        before do
+          @instance.config[:security_group_ids] = security_group_ids
+          @instance.config[:subnet_id]          = subnet_id
+        end
+
+        subject { @instance.create_server_def }
+        its([:security_group_ids]) { should == security_group_ids }
+        its([:subnet_id])          { should == subnet_id }
+      end
+    end
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-instance
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Alexander Tamoykin
@@ -10,86 +9,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.24
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Manage EC2 instances with Chef from the command line
@@ -100,8 +89,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -121,33 +110,26 @@ files:
 homepage: https://github.com/ZestFinance/knife-instance
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3631599552630895710
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3631599552630895710
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Manage EC2 instances with Chef from the command line
 test_files:
 - spec/lib/chef/knife/instance_create_spec.rb