vm_shepherd 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e062bc9d9f56f7ebaed36eaf5843e00ef1b61343
-  data.tar.gz: a3a2ed3f83e784d2ad0686c627505c121397a77b
+  metadata.gz: e7f73287b799bf724b192d5f7344f8d2e6391a31
+  data.tar.gz: 08bb033f69ac1f3a2bfdfa72ff4d8cbc62b21924
 SHA512:
-  metadata.gz: 2f3693d16a10aa1420ee10834e453a344b7ab46f721d4f84ed1709a8eefc5f3914f77ae01253423b48981a9a9fc61a23b709a89a0a0e3602ac995c43a98f8210
-  data.tar.gz: 53636d6efa44563fba84a341c49596a9c7e614d417cf713ce0c802ffd264ed32f3049cbfc9cb5b82fc8d47e54681138b0dae4242e7d6017fe6d0ea11eb22c7fa
+  metadata.gz: 690db91ffe1554092ac8c9a3e33f33ca88961a2f6844206b12c69ec0fa1cb34ab8606e09d9da462c3ea65a181b70c8b84f57d35934d7d93c878b69d12a7f9260
+  data.tar.gz: ef60773ed1d23b22a47484ef5c29e0dbc5518e68280eeb3c6d88795564ca3f28b327f84f7977a81a49de485b77a85d3e996f2dbbc94022076647d4b32cc54e66

data/lib/vm_shepherd/openstack_manager.rb

@@ -8,41 +8,41 @@ module VmShepherd
     def initialize(auth_url:, username:, api_key:, tenant:)
       @auth_url = auth_url
       @username = username
-      @api_key  = api_key
-      @tenant   = tenant
+      @api_key = api_key
+      @tenant = tenant
     end
 
     def deploy(raw_file_path, vm_options)
       say "Uploading the image #{raw_file_path}"
       image = image_service.images.create(
-        name:             "#{vm_options[:name]} #{Time.now}",
-        size:             File.size(raw_file_path),
-        disk_format:      'raw',
+        name: "#{vm_options[:name]} #{Time.now}",
+        size: File.size(raw_file_path),
+        disk_format: 'raw',
         container_format: 'bare',
-        location:         raw_file_path,
+        location: raw_file_path,
       )
       say 'Finished uploading the image'
 
-      flavor          = find_flavor(vm_options[:flavor_name])
-      network         = network_service.networks.find { |net| net.name == vm_options[:network_name] }
+      flavor = find_flavor(vm_options[:flavor_name])
+      network = network_service.networks.find { |net| net.name == vm_options[:network_name] }
       security_groups = vm_options[:security_group_names]
 
       say('Launching an instance')
       server = service.servers.create(
-        name:            vm_options[:name],
-        flavor_ref:      flavor.id,
-        image_ref:       image.id,
-        key_name:        vm_options[:key_name],
+        name: vm_options[:name],
+        flavor_ref: flavor.id,
+        image_ref: image.id,
+        key_name: vm_options[:key_name],
         security_groups: security_groups,
-        nics:            [
-                           {net_id: network.id, v4_fixed_ip: vm_options[:private_ip]}
-                         ],
+        nics: [
+          {net_id: network.id, v4_fixed_ip: vm_options[:private_ip]}
+        ],
       )
       server.wait_for { ready? }
       say('Finished launching an instance')
 
       say('Assigning a Public IP to the instance')
-      ip        = service.addresses.find { |address| address.instance_id.nil? && address.ip == vm_options[:public_ip] }
+      ip = service.addresses.find { |address| address.instance_id.nil? && address.ip == vm_options[:public_ip] }
       ip.server = server
       say('Finished assigning a Public IP to the instance')
     end
@@ -73,45 +73,50 @@ module VmShepherd
     def clean_environment
       say("Destroying #{service.servers.size} instances:")
       retry_until(retry_limit: 2) do
-        service.servers.each do |server|
-          server.volumes.each do |volume|
-            say("  Detaching volume #{volume.id} from server #{server.id}")
-            server.detach_volume(volume.id)
+        begin
+          service.servers.each do |server|
+            server.volumes.each do |volume|
+              say("  Detaching volume #{volume.id} from server #{server.id}")
+              server.detach_volume(volume.id)
+              volume.wait_for { volume.ready? }
+            end
+
+            say("  Destroying instance #{server.id}")
+            server.destroy
           end
 
-          say("  Destroying instance #{server.id}")
-          server.destroy
-        end
-
-        retry_until(retry_limit: 15) do
-          server_count = service.servers.count
-          say("  Waiting for #{server_count} servers to be destroyed")
-          server_count == 0
-        end
-      end
+          retry_until(retry_limit: 15) do
+            server_count = service.servers.count
+            say("  Waiting for #{server_count} servers to be destroyed")
+            server_count == 0
+          end
 
-      private_images = image_service.images.reject(&:is_public)
+          private_images = image_service.images.reject(&:is_public)
 
-      say("Destroying #{private_images.size} images:")
-      private_images.each do |image|
-        next if image.status == 'deleted'
-        say("  Destroying image #{image.id}")
-        image.destroy
-      end
+          say("Destroying #{private_images.size} images:")
+          private_images.each do |image|
+            next if image.status == 'deleted'
+            say("  Destroying image #{image.id}")
+            image.destroy
+          end
 
-      say("Destroying #{service.volumes.size} volumes:")
-      service.volumes.each do |volume|
-        say("  Destroying volume #{volume.id}; current status: [#{volume.status}]")
-        volume.wait_for { volume.ready? }
-        volume.destroy
-      end
+          say("Destroying #{service.volumes.size} volumes:")
+          service.volumes.each do |volume|
+            say("  Destroying volume #{volume.id}; current status: [#{volume.status}]")
+            volume.wait_for { volume.ready? }
+            volume.destroy
+          end
 
-      say("Destroying contents of #{storage_service.directories.size} containers:")
-      storage_service.directories.each do |directory|
-        say("  Destroying #{directory.files.size} files from #{directory.key}")
-        directory.files.each do |file|
-          say("    Destroying file #{file.key}")
-          file.destroy
+          say("Destroying contents of #{storage_service.directories.size} containers:")
+          storage_service.directories.each do |directory|
+            say("  Destroying #{directory.files.size} files from #{directory.key}")
+            directory.files.each do |file|
+              say("    Destroying file #{file.key}")
+              file.destroy
+            end
+          end
+        rescue VmShepherd::RetryHelper::RetryLimitExceeded, Fog::Errors::TimeoutError => e
+          say("Going to retry to cleanup again. First attempt raised #{e.class}: #{e.message}")
         end
       end
     end
@@ -127,22 +132,22 @@ module VmShepherd
 
     def service
       @service ||= Fog::Compute.new(
-        provider:           'openstack',
+        provider: 'openstack',
         openstack_auth_url: auth_url,
         openstack_username: username,
-        openstack_tenant:   tenant,
-        openstack_api_key:  api_key,
+        openstack_tenant: tenant,
+        openstack_api_key: api_key,
         connection_options: connection_options,
       )
     end
 
     def image_service
       @image_service ||= Fog::Image.new(
-        provider:                'openstack',
-        openstack_auth_url:      auth_url,
-        openstack_username:      username,
-        openstack_tenant:        tenant,
-        openstack_api_key:       api_key,
+        provider: 'openstack',
+        openstack_auth_url: auth_url,
+        openstack_username: username,
+        openstack_tenant: tenant,
+        openstack_api_key: api_key,
         openstack_endpoint_type: 'publicURL',
         connection_options: connection_options,
       )
@@ -150,22 +155,22 @@ module VmShepherd
 
     def network_service
       @network_service ||= Fog::Network.new(
-        provider:           'openstack',
+        provider: 'openstack',
         openstack_auth_url: auth_url,
         openstack_username: username,
-        openstack_tenant:   tenant,
-        openstack_api_key:  api_key,
+        openstack_tenant: tenant,
+        openstack_api_key: api_key,
         connection_options: connection_options,
       )
     end
 
     def storage_service
       @network_service ||= Fog::Storage.new(
-        provider:           'openstack',
+        provider: 'openstack',
         openstack_auth_url: auth_url,
         openstack_username: username,
-        openstack_tenant:   tenant,
-        openstack_api_key:  api_key,
+        openstack_tenant: tenant,
+        openstack_api_key: api_key,
         connection_options: connection_options,
       )
     end

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '3.1.5'.freeze
+  VERSION = '3.1.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A tool for booting and tearing down Ops Manager VMs on various Infrastructures.