vm_shepherd 3.6.1 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b60886b794bcc80be233a697303896117ba30bd8
-  data.tar.gz: 9c19f82ea6a62127b8622a847c6253f925dd80c1
+  metadata.gz: e078bebb55b78c281cc95058e277828fac2d924e
+  data.tar.gz: 78696d4efed26e9faf0564074b4eef5045d24f26
 SHA512:
-  metadata.gz: 9a16267362a30cd6b1fc2697cbd475dff8cd49591fa4b363a4a22b21b5d629405070fdab4ae302094fb74f4f39d24b963dc1f785a62812b2371fe5261101c891
-  data.tar.gz: 97cb4e3d2d8040b40ce1f226b738091e832738813e1d06e57702e3100426861265e0420bbe9b6de2b2b716264e145be5898063b5e795cd0b4da0f3fcdd5edc8f
+  metadata.gz: 6b5cec04dd46e3ddff775260f5a46c2c806f345e0abbc0290011ba119bdea1bf1d301cdab3d144c46c32f6130fde72952e5c24ded934dc925a53f390d117dd7e
+  data.tar.gz: d56dd9eddd7559f576db8ce70ccee7a882fee117bb0d0a2f3e77e1e5618bb454402d58fd7309d543954a216edc071052ed8989099b0e655d3d6499e391b09703

data/lib/vm_shepherd/aws_manager.rb

@@ -167,7 +167,7 @@ module VmShepherd
           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
+          instance_type: vm_config.dig('instance_type') || OPS_MANAGER_INSTANCE_TYPE
         }
 
       if (instance_profile = env_config.fetch('outputs').fetch('instance_profile', nil))

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '3.6.1'.freeze
+  VERSION = '3.6.2'.freeze
 end

data/spec/vm_shepherd/aws_manager_spec.rb

@@ -320,6 +320,27 @@ module VmShepherd
         end
       end
 
+      context 'when the instance type is specified in the vm config' do
+        let(:vm_config) do
+          {
+            'vm_name' => 'some-vm-name',
+            'key_name' => 'ssh-key-name',
+            'instance_type' => 't3.medium'
+          }
+        end
+
+        it 'creates an instance' do
+          expect(ec2).to receive_message_chain(:instances, :create).with(
+            image_id: ami_id,
+            key_name: 'ssh-key-name',
+            security_group_ids: ['security-group-id'],
+            subnet: 'public-subnet-id',
+            instance_type: 't3.medium').and_return(instance)
+
+          ami_manager.deploy(ami_file_path: ami_file_path, vm_config: vm_config)
+        end
+      end
+
       context 'when the ip address is in use' do
         it 'retries until the IP address is available' do
           expect(instances).to receive(:create).and_raise(AWS::EC2::Errors::InvalidIPAddress::InUse).once

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.2
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1