vm_shepherd 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbd68ca7cd87040a4ab49f591a0d2b16331051c9
-  data.tar.gz: 5ceaa7fabf7637124880840b74e3bf27f3d9fb28
+  metadata.gz: d651eae0f4aec0ff18eda463eae1a48fc4db49fe
+  data.tar.gz: f89579c3c6107425c651715d3ed3bf96c2ad1aef
 SHA512:
-  metadata.gz: ef7f38a5e4751e80910e01a4848f3ec49d536c47023bba2984696fdadc008e317dac2d8e5f7e8043e116aa6008a4fbd15e55b5c5dba3a909a2d49338d68209fc
-  data.tar.gz: 7d240aa912d76813f3621b994c63fff6bae93336c17a4999156b5b4cfd018e11ecd5670b07490adc5efdd0a8865437858c765c50edd31bc5d46068995950558d
+  metadata.gz: 80b37120cdb02146ef61856c65b1cf2b0cbc7a1e2075559b4665bb65a142743b3ce557fe323d071cda901e34af93370d6e8b24e9d60bae7ae14eb462f9f836b7
+  data.tar.gz: 47d0e3cbb0ae21ae21ecf67ab4c9fb7cdb9a86c7a45040f52ee84ea87feb7d635a7e014b84a20454a1382a610083b5a257e61f38b00db4b3293a3f62a9425fb6

data/lib/vm_shepherd/aws_manager.rb

@@ -45,7 +45,7 @@ module VmShepherd
     end
 
     def deploy(ami_file_path:, vm_config:)
-      image_id = File.read(ami_file_path).strip
+      image_id = read_ami_id(ami_file_path)
 
       instance =
         retry_until do
@@ -75,6 +75,10 @@ module VmShepherd
       instance.add_tag('Name', value: vm_config.fetch(:vm_name))
     end
 
+    def read_ami_id(ami_file_path)
+      YAML.load_file(ami_file_path)[env_config.fetch(:region)]
+    end
+
     def clean_environment
       [:public_subnet_id, :private_subnet_id].each do |subnet_id|
         subnet_id = env_config.fetch(:outputs).fetch(subnet_id)

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.5.0'.freeze
 end

data/spec/vm_shepherd/aws_manager_spec.rb

@@ -5,7 +5,12 @@ module VmShepherd
     let(:access_key) { 'access-key' }
     let(:secret_key) { 'secret-key' }
     let(:ami_id) { 'ami-deadbeef' }
-    let(:ami_file_path) { Tempfile.new('ami-id-file').tap { |f| f.write("#{ami_id}\n"); f.close }.path }
+    let(:ami_file_path) do
+      Tempfile.new('ami-id-file').tap do |f|
+        f.write("#{{'us-east-1' => ami_id, 'not-the-right-region' => 'bad-id'}.to_yaml}")
+        f.close
+      end.path
+    end
     let(:elastic_ip_id) { 'elastic-ip-id' }
     let(:ec2) { double('AWS.ec2') }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1