vm_shepherd 1.5.4 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43c462e588b30f5889f991c17ea977b3770134ce
-  data.tar.gz: a8b35cbfe28cd38c0ac292caca125ae4263f2ae3
+  metadata.gz: 5b205f1eac35569f69fe5709c0019c0fd51a6e86
+  data.tar.gz: 105cc945195c4300389ef2d5e208203ff5d35d6d
 SHA512:
-  metadata.gz: d85a9915a494c2c5a65b7321223d35a29fd9b20b39d5ad2dfd37747f2e34fbfb1b26f1d67aa8f6f3a60f27817b017d4b928600170f21ff82d5bdb8f76053db80
-  data.tar.gz: c4c25f5e4c71d90cd25e85d11ab53da05a354c7165d28562a07af42bfad5d17c503f4adbdc50c984c65855a7367ed166daacea8189f912cc49df6884e356eec3
+  metadata.gz: b872bef61ea5d9f432b822aebd8cfb8de74f97312d104ffc68c452b15ce4ee6c691c336899dddf52835f5b59715f2c5f49caaa951c361e8ce6a551e5295e0bf3
+  data.tar.gz: fda97963ff3c34a9546c870d6e00b87897213f12ca4a4295fc19d46c4d8c0eea765a58260dd9b8d566764686122a48452a449a69d8797ddd71897ba053c21e3b

data/lib/vm_shepherd/aws_manager.rb

@@ -85,9 +85,15 @@ module VmShepherd
         end
       end
 
-      logger.info('Creating an Elastic IP and assigning it to the instance')
-      elastic_ip = AWS.ec2.elastic_ips.create(vpc: true)
-      instance.associate_elastic_ip(elastic_ip.allocation_id)
+      vm_ip_address = vm_config.fetch(:vm_ip_address, nil)
+      if vm_ip_address
+        logger.info('Associating existing IP to the instance')
+        elastic_ip = AWS::EC2::ElasticIp.new(vm_ip_address)
+      else
+        logger.info('Creating an Elastic IP and assigning it to the instance')
+        elastic_ip = AWS.ec2.elastic_ips.create(vpc: true)
+      end
+      instance.associate_elastic_ip(elastic_ip)
       instance.add_tag('Name', value: vm_config.fetch(:vm_name))
     end
 

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.5.4'.freeze
+  VERSION = '1.6.0'.freeze
 end

data/spec/vm_shepherd/aws_manager_spec.rb

@@ -238,13 +238,31 @@ module VmShepherd
         expect { ami_manager.deploy(ami_file_path: ami_file_path, vm_config: vm_config) }.to raise_error(AwsManager::RetryLimitExceeded)
       end
 
-      it 'creates and attaches an elastic IP' do
-        expect(ec2).to receive_message_chain(:elastic_ips, :create).with(
+      context 'vm configuration does not contain an elastic IP' do
+        it 'creates and attaches an elastic IP' do
+          expect(ec2).to receive_message_chain(:elastic_ips, :create).with(
             vpc: true).and_return(elastic_ip)
 
-        expect(instance).to receive(:associate_elastic_ip).with(elastic_ip.allocation_id)
+          expect(instance).to receive(:associate_elastic_ip).with(elastic_ip)
 
-        ami_manager.deploy(ami_file_path: ami_file_path, vm_config: vm_config)
+          ami_manager.deploy(ami_file_path: ami_file_path, vm_config: vm_config)
+        end
+      end
+
+      context 'vm configuration contains an elastic IP' do
+        let(:vm_config) do
+          {
+            vm_name: 'some-vm-name',
+            vm_ip_address: 'some-ip-address'
+          }
+        end
+
+        it 'attaches the provided ip address to the VM' do
+          expect(AWS::EC2::ElasticIp).to receive(:new).and_return(elastic_ip)
+          expect(instance).to receive(:associate_elastic_ip).with(elastic_ip)
+
+          ami_manager.deploy(ami_file_path: ami_file_path, vm_config: vm_config)
+        end
       end
 
       it 'tags the instance with a name' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.0
 platform: ruby
 authors:
 - Ops Manager Team
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A tool for booting and tearing down Ops Manager VMs on various Infrastructures.