vm_shepherd 3.0.8 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a0849bb2535214c6f36d2587fba1b49539cc10d
-  data.tar.gz: 956cd94e7372420ade106411e5bee1a1b2de11bf
+  metadata.gz: f8b26ee24179e3a6eac7866b2fc7e6eae8c7920d
+  data.tar.gz: cfe1558e6ba8f8e2cb1e4793d792ee83624c3fe0
 SHA512:
-  metadata.gz: 96bca2b1fa4ee198c50802ea3b14ed10393bea9392ef5b7ad670516404420859c4bfad94ae2bc9c6ebe1dd010b82d3047eb57ceb67404bc49c7794a3791aba40
-  data.tar.gz: 00fd41ab55b1d82db8741245264bd2ccf9b31d1e234d24ad7a615d23f4e37e42574d9bb073076587ab4be70e6c5e7c5e0446a0fed45d987332bad70b07ce440a
+  metadata.gz: 782f788cbf16bb6c4180feab462392da640383a459ebc6114b883f10c6fdf24c879c1f26032ca1537f7754ca0eefe3ba157ee744c126dccea90f4aa64e0b690e
+  data.tar.gz: f0702d87ecd13df5d751093bb4108743fc9795d14ceff393c8ca481b3ba747a7788423f95abd5defc501f52b36e09bfd2aba5c205cfdbdd887f9110c8b498a45

data/lib/vm_shepherd/aws_manager.rb

@@ -62,7 +62,7 @@ module VmShepherd
       instance =
         retry_until do
           begin
-            AWS.ec2.instances.create(instance_create_params(ami_file_path))
+            AWS.ec2.instances.create(instance_create_params(ami_file_path, vm_config))
           rescue AWS::EC2::Errors::InvalidIPAddress::InUse
             false
           end
@@ -133,11 +133,11 @@ module VmShepherd
     private
     attr_reader :env_config, :logger
 
-    def instance_create_params(ami_file_path)
+    def instance_create_params(ami_file_path, vm_config)
       create_params =
         {
           image_id: read_ami_id(ami_file_path),
-          key_name: env_config.fetch('outputs').fetch('ssh_key_name'),
+          key_name: vm_config.fetch('key_name'),
           security_group_ids: [env_config.fetch('outputs').fetch('security_group')],
           subnet: env_config.fetch('outputs').fetch('public_subnet_id'),
           instance_type: OPS_MANAGER_INSTANCE_TYPE

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '3.0.8'.freeze
+  VERSION = '3.1.0'.freeze
 end

data/spec/fixtures/shepherd/aws-no-elb.yml

@@ -10,11 +10,12 @@ vm_shepherd:
     parameters:
       key_pair_name: key_pair_name
     outputs:
-      ssh_key_name: ssh-key-name
       security_group: security-group-id
       public_subnet_id: public-subnet-id
       subnets: [private-subnet-id, public-subnet-id]
       s3_bucket_name: bucket-name
   vm_configs:
   - vm_name: vm-name
+    key_name: ssh-key-name
   - vm_name: vm-name-2
+    key_name: ssh-key-name-2

data/spec/fixtures/shepherd/aws.yml

@@ -10,7 +10,6 @@ vm_shepherd:
     parameters:
       key_pair_name: key_pair_name
     outputs:
-      ssh_key_name: ssh-key-name
       security_group: security-group-id
       public_subnet_id: public-subnet-id
       subnets: [private-subnet-id, public-subnet-id]
@@ -28,4 +27,6 @@ vm_shepherd:
         subnet_id: CloudFormationSubnetIdOutputKey
   vm_configs:
   - vm_name: vm-name
+    key_name: ssh-key-name
   - vm_name: vm-name-2
+    key_name: ssh-key-name-2

data/spec/vm_shepherd/aws_manager_spec.rb

@@ -26,7 +26,6 @@ module VmShepherd
         },
         'outputs' => {
           'subnets' => ['public-subnet-id', 'private-subnet-id'],
-          'ssh_key_name' => 'ssh-key-name',
           'security_group' => 'security-group-id',
           'public_subnet_id' => 'public-subnet-id',
         }.merge(extra_outputs),
@@ -39,6 +38,7 @@ module VmShepherd
     let(:vm_config) do
       {
         'vm_name' => 'some-vm-name',
+        'key_name' => 'ssh-key-name',
       }
     end
     let(:fake_logger) { instance_double(Logger).as_null_object }
@@ -326,7 +326,8 @@ module VmShepherd
         let(:vm_config) do
           {
             'vm_name' => 'some-vm-name',
-            'vm_ip_address' => 'some-ip-address'
+            'vm_ip_address' => 'some-ip-address',
+            'key_name' => 'ssh-key-name',
           }
         end
 

data/spec/vm_shepherd/shepherd_spec.rb

@@ -20,7 +20,6 @@ module VmShepherd
           'key_pair_name' => 'key_pair_name'
         },
         'outputs'        => {
-          'ssh_key_name'      => 'ssh-key-name',
           'security_group'    => 'security-group-id',
           'public_subnet_id'  => 'public-subnet-id',
           'subnets'           => ['private-subnet-id', 'public-subnet-id'],
@@ -193,8 +192,8 @@ module VmShepherd
         let(:aws_manager) { instance_double(AwsManager) }
         let(:first_ami_file_path) { 'PATH_TO_AMI_FILE' }
         let(:last_ami_file_path) { 'PATH_TO_AMI_FILE-2' }
-        let(:first_aws_options) { {'vm_name' => 'vm-name'} }
-        let(:last_aws_options) { {'vm_name' => 'vm-name-2'} }
+        let(:first_aws_options) { {'vm_name' => 'vm-name', 'key_name' => 'ssh-key-name'} }
+        let(:last_aws_options) { {'vm_name' => 'vm-name-2', 'key_name' => 'ssh-key-name-2'} }
 
         it 'uses AwsManager to launch a VM' do
           expect(AwsManager).to receive(:new).with(env_config: aws_env_config, logger: instance_of(Logger)).and_return(aws_manager)
@@ -373,8 +372,8 @@ module VmShepherd
       context 'when IAAS is AWS' do
         let(:settings_fixture_name) { 'aws.yml' }
         let(:aws_manager) { instance_double(AwsManager) }
-        let(:first_ami_options) { {'vm_name' => 'vm-name'} }
-        let(:last_ami_options) { {'vm_name' => 'vm-name-2'} }
+        let(:first_ami_options) { {'vm_name' => 'vm-name', 'key_name' => 'ssh-key-name'} }
+        let(:last_ami_options) { {'vm_name' => 'vm-name-2', 'key_name' => 'ssh-key-name-2'} }
 
         it 'uses AwsManager to destroy a VM' do
           expect(AwsManager).to receive(:new).with(env_config: aws_env_config, logger: instance_of(Logger)).and_return(aws_manager)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.1.0
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A tool for booting and tearing down Ops Manager VMs on various Infrastructures.