vm_shepherd 3.1.8 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ce3022dc144a0fbacf8b1f888dee0bb1d7ecd62
-  data.tar.gz: f4b46bc9b6a7b628e55197eebe7e5b2edbf852af
+  metadata.gz: 7934b21954a88c73bdfb023a264734be53b0ce6d
+  data.tar.gz: 9d0c1971e9eab775684389e200f1f826827d325a
 SHA512:
-  metadata.gz: f42509c409a72903021dc28fc309ad2b3cc932cc4cb221b914ef39e0a5be9c50ac2264b272ec60e71db4b117fb8c1028f262b8b3abfc2312932053fd046e7369
-  data.tar.gz: 35646ccd3fa5b9cb4e1aedf84a390d54a9dd719e7e7d54e5140bfed557f56d3b23f6af66a0002947f308fdd0a2cc4b4274d86ec0b4593a09b6c36ac919256e60
+  metadata.gz: b182c70312c21509a5536e84669520c757381cf4068de1cc676ff54c77b0dde8c4fac6e188bec2a995c72d7af3c67217b45f60228aa5add9a129444ae7105e32
+  data.tar.gz: 918c50edb94876dc9638d9858804409a907690100136bf1b53b747617fc5d6417f3fb39cebd50f157fb131415d27ec6f25ce7de0a7bc26d60a0c06f0c6c199f3

data/lib/vm_shepherd/aws_manager.rb

@@ -50,7 +50,7 @@ module VmShepherd
           else
             if ROLLBACK_COMPLETE == status
               logger.info("Rolling back stack [#{stack.name}]; events listed below")
-              stack.events.select{|event| event.resource_status_reason}.each do |failed_event|
+              stack.events.select { |event| event.resource_status_reason }.each do |failed_event|
                 logger.info("#{failed_event.resource_properties} #{failed_event.resource_status_reason}")
               end
               stack.delete
@@ -213,9 +213,7 @@ module VmShepherd
     end
 
     def create_elb(stack, elb_config)
-      elb = AWS::ELB.new
       elb_params = {
-        load_balancer_name: elb_config['name'],
         listeners: [],
         subnets: [subnet_id(stack, elb_config)],
         security_groups: [create_security_group(stack, elb_config).security_group_id]
@@ -228,8 +226,18 @@ module VmShepherd
         }
       end
 
-      logger.info('Creating an ELB')
-      elb.client.create_load_balancer(elb_params)
+      logger.info("Creating #{elb_config['name']} ELB")
+      elb = AWS::ELB.new.load_balancers.create(elb_config['name'], elb_params)
+      port = elb_config.fetch('health_check', {})['ping_target'] || 'TCP:80'
+      elb.configure_health_check(
+        {
+          target: port,
+          healthy_threshold: 2,
+          unhealthy_threshold: 5,
+          interval: 5,
+          timeout: 2,
+        }
+      )
     end
 
     def create_security_group(stack, elb_config)

data/lib/vm_shepherd/shepherd.rb

@@ -220,19 +220,8 @@ module VmShepherd
     end
 
     def ami_elb_config
-      if @env_config.dig('elbs')
-        {
-          'elbs' => @env_config.dig('elbs').map do |elb|
-            {
-              'name'              => elb.dig('name'),
-              'port_mappings'     => elb.dig('port_mappings'),
-              'stack_output_keys' => elb.dig('stack_output_keys'),
-            }
-          end
-        }
-      else
-        {}
-      end
+      return {} unless @env_config.dig('elbs')
+      {'elbs' => @env_config.dig('elbs')}
     end
 
     def openstack_vm_manager(vm_shepherd_config)

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '3.1.8'.freeze
+  VERSION = '3.2.0'.freeze
 end

data/spec/vm_shepherd/aws_manager_spec.rb

@@ -61,8 +61,8 @@ module VmShepherd
       let(:cfm) { instance_double(AWS::CloudFormation, stacks: stack_collection) }
       let(:stack) { instance_double(AWS::CloudFormation::Stack, status: 'CREATE_COMPLETE') }
       let(:stack_collection) { instance_double(AWS::CloudFormation::StackCollection) }
-      let(:elb) { instance_double(AWS::ELB, client: elb_client) }
-      let(:elb_client) { double(AWS::ELB::Client) }
+      let(:elb) { instance_double(AWS::ELB, load_balancers: load_balancers) }
+      let(:load_balancers) { instance_double(AWS::ELB::LoadBalancerCollection) }
 
       before do
         allow(AWS::CloudFormation).to receive(:new).and_return(cfm)
@@ -120,6 +120,9 @@ module VmShepherd
               {
                 'name' => 'elb-1-name',
                 'port_mappings' => [[1111, 11]],
+                'health_check' => {
+                  'ping_target' => 'TCP:1234',
+                },
                 'stack_output_keys' => {
                   'vpc_id' => 'vpc_id',
                   'subnet_id' => 'private_subnet',
@@ -166,6 +169,9 @@ module VmShepherd
         let(:elb_1_security_group) { instance_double(AWS::EC2::SecurityGroup, security_group_id: 'elb-1-security-group-id') }
         let(:elb_2_security_group) { instance_double(AWS::EC2::SecurityGroup, security_group_id: 'elb-2-security-group-id') }
 
+        let(:elb_1) { instance_double(AWS::ELB::LoadBalancer, configure_health_check: nil) }
+        let(:elb_2) { instance_double(AWS::ELB::LoadBalancer) }
+
         before do
           allow(ec2).to receive(:client).and_return(ec2_client)
           allow(ec2_client).to receive(:create_security_group).with(hash_including(group_name: 'fake-stack-name_elb-1-name')).
@@ -175,7 +181,7 @@ module VmShepherd
           allow(ec2).to receive(:security_groups).and_return(security_groups)
           allow(elb_1_security_group).to receive(:authorize_ingress)
           allow(elb_2_security_group).to receive(:authorize_ingress)
-          allow(elb_client).to receive(:create_load_balancer)
+          allow(load_balancers).to receive(:create).and_return(elb_1)
         end
 
         it 'creates and attaches a security group for the ELBs' do
@@ -199,21 +205,30 @@ module VmShepherd
         end
 
         it 'attaches an elb with the name of the stack for the ELBs' do
+          health_check_params = {
+            healthy_threshold: 2,
+            unhealthy_threshold: 5,
+            interval: 5,
+            timeout: 2,
+          }
           elb_1_params = {
-            load_balancer_name: 'elb-1-name',
             listeners: [{protocol: 'TCP', load_balancer_port: 1111, instance_protocol: 'TCP', instance_port: 11}],
             subnets: ['fake-subnet-id'],
             security_groups: ['elb-1-security-group-id']
           }
-          expect(elb_client).to receive(:create_load_balancer).with(elb_1_params)
+          expect(load_balancers).to receive(:create).with('elb-1-name', elb_1_params).and_return(elb_1)
+          expect(elb_1).to receive(:configure_health_check).with(
+            health_check_params.merge(target: 'TCP:1234')
+          )
           elb_2_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-2-security-group-id']
           }
-          expect(elb_client).to receive(:create_load_balancer).with(elb_2_params)
-
+          expect(load_balancers).to receive(:create).with('elb-2-name', elb_2_params).and_return(elb_2)
+          expect(elb_2).to receive(:configure_health_check).with(
+            health_check_params.merge(target: 'TCP:80')
+          )
           ami_manager.prepare_environment(cloudformation_template_file.path)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 3.1.8
+  version: 3.2.0
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1