vm_shepherd 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65cd3b777476ef982c70b4c99fc270ce34f0084a
-  data.tar.gz: b5f22dfd3e3111c58816f5e9260b53e1cfbd868a
+  metadata.gz: f9dff91e8705699b028d932fca884d70920cd183
+  data.tar.gz: 574acbac07103a58ec844d9aec09b5a4de2b38e6
 SHA512:
-  metadata.gz: 3c48b1d7f31e478ede8d86e5834689d22db887e879b6031fdcebf72c33067d6b80676f6313fbac27ab600e90c445d1d35ac5eb1009d5b3ea295d40df77f5b1ba
-  data.tar.gz: cc6ebc49f345869086b765fcd2971abf7b768737ae7d8404ae2a226dea441afc2b0bcac1ccbea5f958c85723bf67b250b76599eecc82ba6b4fd0bd0d72934499
+  metadata.gz: 1428e5edecb8f5f3cd0fbe3a0551fe379fe318027a39567fe52971df159202a6cd9bb9070a717664e2dc326056815b85bd553d7a88a6a61d3b0b440cac58f027
+  data.tar.gz: 11360f94e2f18c126d54e18c20ccfbf1d72a68c8b3eba2a305df85e532409eba0f411dc4650a13cb39cc013711090a4b2eb88dfc89e6f3237f2b9bfb1d5a834d

data/lib/vm_shepherd/aws_manager.rb

@@ -50,7 +50,7 @@ module VmShepherd
         end
       end
 
-      if (elb_config = env_config[:elb])
+      env_config.fetch(:elbs, []).each do |elb_config|
         create_elb(stack, elb_config)
       end
     end

data/lib/vm_shepherd/shepherd.rb

@@ -213,13 +213,15 @@ module VmShepherd
     end
 
     def ami_elb_config
-      if settings.vm_shepherd.env_config.elb
+      if settings.vm_shepherd.env_config.elbs
         {
-          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,
-          }
+          elbs: settings.vm_shepherd.env_config.elbs.map do |elb|
+            {
+              name:              elb.name,
+              port_mappings:     elb.port_mappings,
+              stack_output_keys: elb.stack_output_keys.to_h,
+            }
+          end
         }
       else
         {}

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.6.1'.freeze
+  VERSION = '1.7.0'.freeze
 end

data/spec/fixtures/shepherd/aws.yml

@@ -15,12 +15,17 @@ vm_shepherd:
       public_subnet_id: public-subnet-id
       private_subnet_id: private-subnet-id
       s3_bucket_name: bucket-name
-    elb:
-      name: some-elb-name
+    elbs:
+    - name: elb-1-name
       port_mappings: [[1111,11]]
       stack_output_keys:
         vpc_id: CloudFormationVpcIdOutputKey
         subnet_id: CloudFormationSubnetIdOutputKey
+    - name: elb-2-name
+      port_mappings: [[2222,22]]
+      stack_output_keys:
+        vpc_id: CloudFormationVpcIdOutputKey
+        subnet_id: CloudFormationSubnetIdOutputKey
   vm_configs:
   - vm_name: vm-name
   - vm_name: vm-name-2

data/spec/vm_shepherd/aws_manager_spec.rb

@@ -108,14 +108,24 @@ module VmShepherd
       context 'when the elb setting is present' do
         let(:extra_configs) do
           {
-            elb: {
-              name: 'elb-name',
-              port_mappings: [[1111, 11]],
-              stack_output_keys: {
-                vpc_id: 'vpc_id',
-                subnet_id: 'private_subnet',
-              },
-            },
+            elbs: [
+                    {
+                      name: 'elb-1-name',
+                      port_mappings: [[1111, 11]],
+                      stack_output_keys: {
+                        vpc_id: 'vpc_id',
+                        subnet_id: 'private_subnet',
+                      },
+                    },
+                    {
+                      name: 'elb-2-name',
+                      port_mappings: [[2222, 22]],
+                      stack_output_keys: {
+                        vpc_id: 'vpc_id',
+                        subnet_id: 'private_subnet',
+                      },
+                    }
+                  ],
           }
         end
         let(:stack) do
@@ -151,7 +161,7 @@ module VmShepherd
           allow(elb_client).to receive(:create_load_balancer)
         end
 
-        it 'creates and attaches a security group' do
+        it 'creates and attaches a security group for the first ELB' do
           security_group_args = {
             group_name: 'fake-stack-name',
             description: 'ELB Security Group',
@@ -163,9 +173,9 @@ module VmShepherd
           ami_manager.prepare_environment(cloudformation_template_file.path)
         end
 
-        it 'attaches an elb with the name of the stack' do
+        it 'attaches an elb with the name of the stack for the first ELB' do
           elb_params = {
-            load_balancer_name: 'elb-name',
+            load_balancer_name: 'elb-1-name',
             listeners: [
               {protocol: 'TCP', load_balancer_port: 1111, instance_protocol: 'TCP', instance_port: 11},
             ],
@@ -176,6 +186,32 @@ module VmShepherd
 
           ami_manager.prepare_environment(cloudformation_template_file.path)
         end
+
+        it 'creates and attaches a security group for the second ELB' do
+          security_group_args = {
+            group_name: 'fake-stack-name',
+            description: 'ELB Security Group',
+            vpc_id: 'fake-vpc-id',
+          }
+          expect(ec2_client).to receive(:create_security_group).with(security_group_args).and_return(create_security_group_response)
+          expect(elb_security_group).to receive(:authorize_ingress).with(:tcp, 2222, '0.0.0.0/0')
+
+          ami_manager.prepare_environment(cloudformation_template_file.path)
+        end
+
+        it 'attaches an elb with the name of the stack for the second ELB' do
+          elb_params = {
+            load_balancer_name: 'elb-2-name',
+            listeners: [
+              {protocol: 'TCP', load_balancer_port: 2222, instance_protocol: 'TCP', instance_port: 22},
+            ],
+            subnets: ['fake-subnet-id'],
+            security_groups: ['elb-security-group-id']
+          }
+          expect(elb_client).to receive(:create_load_balancer).with(elb_params)
+
+          ami_manager.prepare_environment(cloudformation_template_file.path)
+        end
       end
     end
 

data/spec/vm_shepherd/shepherd_spec.rb

@@ -30,14 +30,24 @@ module VmShepherd
     end
     let(:aws_elb_config) do
       {
-        elb: {
-          name: 'some-elb-name',
-          port_mappings: [[1111, 11]],
-          stack_output_keys: {
-            vpc_id: 'CloudFormationVpcIdOutputKey',
-            subnet_id: 'CloudFormationSubnetIdOutputKey',
-          },
-        },
+        elbs: [
+                {
+                  name:              'elb-1-name',
+                  port_mappings:     [[1111, 11]],
+                  stack_output_keys: {
+                    vpc_id:    'CloudFormationVpcIdOutputKey',
+                    subnet_id: 'CloudFormationSubnetIdOutputKey',
+                  },
+                },
+                {
+                  name:              'elb-2-name',
+                  port_mappings:     [[2222, 22]],
+                  stack_output_keys: {
+                    vpc_id:    'CloudFormationVpcIdOutputKey',
+                    subnet_id: 'CloudFormationSubnetIdOutputKey',
+                  },
+                }
+              ],
       }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -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.8
 signing_key: 
 specification_version: 4
 summary: A tool for booting and tearing down Ops Manager VMs on various Infrastructures.