bosh_openstack_cpi 1.2986.0 → 1.2989.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d82c753826d292e7249cdf4a86b7b93ff6d3898
-  data.tar.gz: e07d016f04e66275892228cf61e5e7cd3828d4bf
+  metadata.gz: 71490bb6f127ca6287a94d5a82c63f287d7c29cf
+  data.tar.gz: c48086b21d58ade0eeaac458f0edc7898136fad4
 SHA512:
-  metadata.gz: fa7eb0172890f488af4ba849b71bfc494083b76a8c9f7db5a21ac5cdbcdd1786ee0b1bf8b741bd0d1cfa3ea0fcb87ae6d9966c0ea9d279bab09493dcde78a876
-  data.tar.gz: 7f5299086feebf0740f385debe208be6e32f0f0828a3572451f684b69a57ed816fdf5080392ab45d62382f73264b272d3d512f3be23e9f8d43abaef3860226f7
+  metadata.gz: b61589c309a1454f62a01c73a73de23340a9bd0098270430dd5ecd3708553ca0d453b50833288a8f0812d6691ad07335036dfa54eb5ba20b851477a3285fbbfc
+  data.tar.gz: 52addea7ffa4d413ba146120d6e2c8e69ccc0e7fe9afcdef3e680a92952141275156dbc22e0f18c749fe5505219f58ef870480d98a86a183136e730a5163c421

data/lib/cloud/openstack/cloud.rb

@@ -302,22 +302,20 @@ module Bosh::OpenStackCloud
           network_configurator.configure(@openstack, server)
         rescue Bosh::Clouds::CloudError => e
           @logger.warn("Failed to create server: #{e.message}")
-
-          with_openstack { server.destroy }
-
-          begin
-            wait_resource(server, [:terminated, :deleted], :state, true)
-          rescue Bosh::Clouds::CloudError => delete_server_error
-            @logger.warn("Failed to destroy server: #{delete_server_error.inspect}\n#{delete_server_error.backtrace.join('\n')}")
-          end
-
+          destroy_server(server)
           raise Bosh::Clouds::VMCreationFailed.new(true), e.message
         end
 
-        @logger.info("Updating settings for server `#{server.id}'...")
-        settings = initial_agent_settings(server_name, agent_id, network_spec, environment,
-                                          flavor_has_ephemeral_disk?(flavor))
-        @registry.update_settings(server.name, settings)
+        begin
+          @logger.info("Updating settings for server `#{server.id}'...")
+          settings = initial_agent_settings(server_name, agent_id, network_spec, environment,
+                                            flavor_has_ephemeral_disk?(flavor))
+          @registry.update_settings(server.name, settings)
+        rescue Bosh::Clouds::CloudError => e
+          @logger.warn("Failed to register server: #{e.message}")
+          destroy_server(server)
+          raise Bosh::Clouds::VMCreationFailed.new(false), e.message
+        end
 
         server.id.to_s
       end
@@ -980,5 +978,16 @@ module Bosh::OpenStackCloud
       end
       options
     end
+
+    # Destroy server and wait until the server is really terminated/deleted
+    def destroy_server(server)
+      with_openstack { server.destroy }
+
+      begin
+        wait_resource(server, [:terminated, :deleted], :state, true)
+      rescue Bosh::Clouds::CloudError => delete_server_error
+        @logger.warn("Failed to destroy server: #{delete_server_error.inspect}\n#{delete_server_error.backtrace.join('\n')}")
+      end
+    end
   end
 end

data/lib/cloud/openstack/version.rb

@@ -3,6 +3,6 @@
 
 module Bosh
   module OpenStackCloud
-    VERSION = '1.2986.0'
+    VERSION = '1.2989.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_openstack_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2986.0
+  version: 1.2989.0
 platform: ruby
 authors:
 - Piston Cloud Computing / VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2986.0
+        version: 1.2989.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2986.0
+        version: 1.2989.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2986.0
+        version: 1.2989.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2986.0
+        version: 1.2989.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2986.0
+        version: 1.2989.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2986.0
+        version: 1.2989.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH OpenStack CPI
-  bc16ca
+  0c4ecd
 email: support@cloudfoundry.com
 executables:
 - bosh_openstack_console