vm_shepherd 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8e58d02206376125f4961911d059351ba3adfd6
-  data.tar.gz: 6661ce7be0f490b236967364ae77fa3bd1385959
+  metadata.gz: 0264092014869cdb1aca61d659d9838c50e239e5
+  data.tar.gz: 77f1ca1d5c5d7d07a6e5aca5325d807c8ba7cc74
 SHA512:
-  metadata.gz: f6321f3612d2c0ae50da30554e65e1c2b1093f7cfdc06081016a1d20d132a08864b8c1be5c424da94099b1c64ccce57e602f922b1479a9d63b660c05c3ae11a6
-  data.tar.gz: c11e4203f315e9e7c1f85fbf01a5cb24dca66e9ae842b048403dd0aa38cfe320c4eada570f769577284a235ab543753f83d7fedbddc4bca04fee138d7a81e365
+  metadata.gz: b0c84fd67b03781fe92547580a1b4b4fadf8b042df347010489c294620050756e2048e962c26c170212d6845fdf0734d39e0e194d803810c9eeb95bfcad25621
+  data.tar.gz: effff40c94b612051a6942de07e319bb373dabf816c40de9bb6e4ef96f94ece8443932f9cdb7f6f320d531d5047a0ae26e615daef407533d6ce281a28cbaae57

data/lib/vm_shepherd/shepherd.rb

@@ -203,13 +203,22 @@ module VmShepherd
           json_file: settings.vm_shepherd.env_config.json_file,
           parameters: settings.vm_shepherd.env_config.parameters_as_a_hash,
           outputs: settings.vm_shepherd.env_config.outputs.to_h,
+        }.merge(ami_elb_config)
+      )
+    end
+
+    def ami_elb_config
+      if settings.vm_shepherd.env_config.elb
+        {
           elb: {
             name: settings.vm_shepherd.env_config.elb.name,
             port_mappings: settings.vm_shepherd.env_config.elb.port_mappings,
             stack_output_keys: settings.vm_shepherd.env_config.elb.stack_output_keys.to_h,
-          },
+          }
         }
-      )
+      else
+        {}
+      end
     end
 
     def openstack_vm_manager(vm_shepherd_config)

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.3.1'.freeze
+  VERSION = '1.3.2'.freeze
 end

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

@@ -0,0 +1,19 @@
+iaas_type: aws
+
+vm_shepherd:
+  env_config:
+    stack_name: aws-stack-name
+    aws_access_key: aws-access-key
+    aws_secret_key: aws-secret-key
+    json_file: cloudformation.json
+    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
+      private_subnet_id: private-subnet-id
+      s3_bucket_name: bucket-name
+  vm_configs:
+  - vm_name: vm-name
+  - vm_name: vm-name-2

data/spec/vm_shepherd/shepherd_spec.rb

@@ -187,6 +187,37 @@ module VmShepherd
         it 'fails if improper paths are given' do
           expect { manager.deploy(paths: ['FIRST_FAKE_PATH']) }.to raise_error(ArgumentError)
         end
+
+        context 'when there is no ELB configuration' do
+          let(:settings_fixture_name) { 'aws-no-elb.yml' }
+
+          let(:aws_env_config) do
+            {
+              stack_name: 'aws-stack-name',
+              aws_access_key: 'aws-access-key',
+              aws_secret_key: 'aws-secret-key',
+              json_file: 'cloudformation.json',
+              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',
+                private_subnet_id: 'private-subnet-id',
+                s3_bucket_name: 'bucket-name',
+              },
+            }
+          end
+
+          it 'uses AwsManager to launch a VM' do
+            expect(AwsManager).to receive(:new).with(aws_env_config).and_return(aws_manager)
+            expect(aws_manager).to receive(:deploy).with(ami_file_path: first_ami_file_path, vm_config: first_aws_options)
+            expect(aws_manager).to receive(:deploy).with(ami_file_path: last_ami_file_path, vm_config: last_aws_options)
+
+            manager.deploy(paths: [first_ami_file_path, last_ami_file_path])
+          end
+        end
       end
 
       context 'with OpenStack settings' do
@@ -348,6 +379,37 @@ module VmShepherd
 
           manager.destroy
         end
+
+        context 'when there is no ELB configuration' do
+          let(:settings_fixture_name) { 'aws-no-elb.yml' }
+
+          let(:aws_env_config) do
+            {
+              stack_name: 'aws-stack-name',
+              aws_access_key: 'aws-access-key',
+              aws_secret_key: 'aws-secret-key',
+              json_file: 'cloudformation.json',
+              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',
+                private_subnet_id: 'private-subnet-id',
+                s3_bucket_name: 'bucket-name',
+              },
+            }
+          end
+
+          it 'uses AwsManager to destroy a VM' do
+            expect(AwsManager).to receive(:new).with(aws_env_config).and_return(aws_manager)
+            expect(aws_manager).to receive(:destroy).with(first_ami_options)
+            expect(aws_manager).to receive(:destroy).with(last_ami_options)
+
+            manager.destroy
+          end
+        end
       end
 
       context 'when IAAS is Openstack' do
@@ -513,6 +575,35 @@ module VmShepherd
           expect(aws_manager).to receive(:clean_environment)
           manager.clean_environment
         end
+
+        context 'when there is no ELB configuration' do
+          let(:settings_fixture_name) { 'aws-no-elb.yml' }
+
+          let(:aws_env_config) do
+            {
+              stack_name: 'aws-stack-name',
+              aws_access_key: 'aws-access-key',
+              aws_secret_key: 'aws-secret-key',
+              json_file: 'cloudformation.json',
+              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',
+                private_subnet_id: 'private-subnet-id',
+                s3_bucket_name: 'bucket-name',
+              },
+            }
+          end
+
+          it 'uses AwsManager to destroy a VM' do
+            expect(AwsManager).to receive(:new).with(aws_env_config).and_return(aws_manager)
+            expect(aws_manager).to receive(:clean_environment)
+            manager.clean_environment
+          end
+        end
       end
 
       context 'when IAAS is Openstack' do
@@ -565,6 +656,35 @@ module VmShepherd
           expect(ams_manager).to receive(:prepare_environment).with('cloudformation.json')
           manager.prepare_environment
         end
+
+        context 'when there is no ELB configuration' do
+          let(:settings_fixture_name) { 'aws-no-elb.yml' }
+
+          let(:aws_env_config) do
+            {
+              stack_name: 'aws-stack-name',
+              aws_access_key: 'aws-access-key',
+              aws_secret_key: 'aws-secret-key',
+              json_file: 'cloudformation.json',
+              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',
+                private_subnet_id: 'private-subnet-id',
+                s3_bucket_name: 'bucket-name',
+              },
+            }
+          end
+
+          it 'uses AwsManager to create an environment' do
+            expect(AwsManager).to receive(:new).with(aws_env_config).and_return(ams_manager)
+            expect(ams_manager).to receive(:prepare_environment).with('cloudformation.json')
+            manager.prepare_environment
+          end
+        end
       end
 
       context 'when IAAS is vcloud' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -161,6 +161,7 @@ files:
 - lib/vm_shepherd/version.rb
 - lib/vm_shepherd/vsphere_manager.rb
 - spec/fixtures/ova_manager/foo.ova
+- spec/fixtures/shepherd/aws-no-elb.yml
 - spec/fixtures/shepherd/aws.yml
 - spec/fixtures/shepherd/openstack.yml
 - spec/fixtures/shepherd/unknown.yml
@@ -200,6 +201,7 @@ specification_version: 4
 summary: A tool for booting and tearing down Ops Manager VMs on various Infrastructures.
 test_files:
 - spec/fixtures/ova_manager/foo.ova
+- spec/fixtures/shepherd/aws-no-elb.yml
 - spec/fixtures/shepherd/aws.yml
 - spec/fixtures/shepherd/openstack.yml
 - spec/fixtures/shepherd/unknown.yml