vm_shepherd 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32390871776d9ded0d615b3b4e453d0c4e798ce6
-  data.tar.gz: 23a6de2acdb418b1862ae472d66149f0b1d37e27
+  metadata.gz: 4c28ff60aceef4bca731813761ce712123b7f941
+  data.tar.gz: 055d66480ba8775dab95bd80554556654da54c55
 SHA512:
-  metadata.gz: 2c3295257e06d661a1a8d98033ada7867ba1fa6229ade524441864fbfb0347d3991c27ea4e3f056afc58403307d820f60566162504a5328f7ab5dec610cb376f
-  data.tar.gz: d47c7cff06d2f0046c2cb0dc8cd19d497b7a0906dd05e706c583b8b18302a1ed18292828ba8a5ec5ea2adf2db168f3a7ca65c3b81a95d8afa523de6e4fb831cc
+  metadata.gz: 930db4b3aba4201353764122080c6badbc9ba2021c5ada38018738647bdbcfb14f65a647113abebb80b3d1a9bb9f04fe1cf051ebcf13ffcc3ccf002f7146310a
+  data.tar.gz: f9fa8ea157d70fb41454e44716616b1b682d868d9c23cfab097e8e8d895c5302e5f65422552bccdc7e52338d42c731c1d42059a9050d9d0153d8037bcfe708cf

data/lib/vm_shepherd/openstack_manager.rb

@@ -1,7 +1,10 @@
 require 'fog'
+require 'vm_shepherd/retry_helper'
 
 module VmShepherd
   class OpenstackManager
+    include VmShepherd::RetryHelper
+
     def initialize(auth_url:, username:, api_key:, tenant:)
       @auth_url = auth_url
       @username = username
@@ -75,6 +78,12 @@ module VmShepherd
         server.destroy
       end
 
+      retry_until(retry_limit: 30) 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)
 
       say("Destroying #{private_images.size} images:")

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.10.0'.freeze
+  VERSION = '1.10.1'.freeze
 end

data/spec/vm_shepherd/openstack_manager_spec.rb

@@ -322,6 +322,20 @@ module VmShepherd
         }.to change { openstack_vm_manager.service.servers.size }.from(2).to(0)
       end
 
+      it 'waits until there are no servers before deleting images' do
+        stub_const("VmShepherd::RetryHelper::RETRY_INTERVAL", 0)
+
+        servers = instance_double(Array)
+        allow(openstack_vm_manager.service).to receive(:servers).and_return(servers)
+
+        allow(servers).to receive(:size)
+        allow(servers).to receive(:each).and_return([])
+        expect(servers).to receive(:count).and_return(1,0).ordered
+        expect(openstack_vm_manager.image_service).to receive(:images).and_return([]).ordered
+
+        openstack_vm_manager.clean_environment
+      end
+
       it 'deletes all private images' do
         expect {
           openstack_vm_manager.clean_environment

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A tool for booting and tearing down Ops Manager VMs on various Infrastructures.