bosh_openstack_cpi 1.3048.0 → 1.3050.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ea6d566ec1030eebb8f64fd9ffcf96abc46b916
-  data.tar.gz: eb8a153459334fad3613288377b11c44d8a32185
+  metadata.gz: 77ef3e3b4dfd8a243a6c8984b890cfaac5e7d1c9
+  data.tar.gz: 74319c92621ba3e24b9b61ca0e0d6637f3b7f9cd
 SHA512:
-  metadata.gz: 87f303a055524376b0d54f38716170d812cb836758568b95a058277ee17650a03abf819966fa0a22bdbf0fab2b9180545c4fc73846d99af0f52f67c6a74c3d15
-  data.tar.gz: 17969d3935afa0bc6b0c2bc458395f5229a3cb3415ace42cc353309ee6df92ece19ffebe0f93ca74c13a6c31fdc7253024cfe59633df2575199e49bf192b9437
+  metadata.gz: bb770f243c46fbfe17a2b97a36b75a35e7642823902d8064df6c7f5431e68386a45651a1b2d7bb992752d3f1adca419daae0beceaee25ec3768198105bd21829
+  data.tar.gz: 4229f2a405c25195deab289e26ca106de6d3f018986e1436cb423ff483656b71f9943d9468e4d8e724a1d55557702050718fee68bdba76c0cc3edf12dd1e8cfb

data/USAGE.md

@@ -20,6 +20,8 @@ The registry options are passed to the Openstack CPI by the BOSH director based
   OpenStack API key
 * `tenant` (required)
   OpenStack tenant name
+* `domain` (optional)
+  OpenStack domain name
 * `region` (optional)
   OpenStack region
 * `endpoint_type` (optional)

data/bin/openstack_cpi

@@ -11,10 +11,18 @@ cloud_config = OpenStruct.new(:logger => Logger.new(STDERR))
 
 Bosh::Clouds::Config.configure(cloud_config)
 
-cloud_properties = cpi_config['cloud']['properties']
-cloud_properties['cpi_log'] = StringIO.new
+cpi_log = StringIO.new
 
-cpi = Bosh::Clouds::Openstack.new(cloud_properties)
-cli = Bosh::Cpi::Cli.new(cpi, cloud_properties['cpi_log'], STDOUT)
+cpi_lambda = lambda do
+  unless cpi_config.has_key?('cloud') && cpi_config['cloud'].has_key?('properties')
+    raise "Could not find cloud properties in the configuration"
+  end
 
-cli.run(ARGF.read)
+  cloud_properties = cpi_config['cloud']['properties']
+  cloud_properties['cpi_log'] = cpi_log
+  Bosh::Clouds::Openstack.new(cloud_properties)
+end
+
+cli = Bosh::Cpi::Cli.new(cpi_lambda, cpi_log, STDOUT)
+
+cli.run(ARGF.read)

data/lib/cloud/openstack/cloud.rb

@@ -62,12 +62,13 @@ module Bosh::OpenStackCloud
         :openstack_username => @openstack_properties['username'],
         :openstack_api_key => @openstack_properties['api_key'],
         :openstack_tenant => @openstack_properties['tenant'],
+        :openstack_domain_name => @openstack_properties['domain'],
         :openstack_region => @openstack_properties['region'],
         :openstack_endpoint_type => @openstack_properties['endpoint_type'],
         :connection_options => @openstack_properties['connection_options'].merge(@extra_connection_options)
       }
 
-      connect_retry_errors = [Excon::Errors::GatewayTimeout]
+      connect_retry_errors = [Excon::Errors::GatewayTimeout, Excon::Errors::SocketError]
 
       @connect_retry_options = {
         sleep: CONNECT_RETRY_DELAY,
@@ -94,6 +95,7 @@ module Bosh::OpenStackCloud
         :openstack_username => @openstack_properties['username'],
         :openstack_api_key => @openstack_properties['api_key'],
         :openstack_tenant => @openstack_properties['tenant'],
+        :openstack_domain_name => @openstack_properties['domain'],
         :openstack_region => @openstack_properties['region'],
         :openstack_endpoint_type => @openstack_properties['endpoint_type'],
         :connection_options => @openstack_properties['connection_options'].merge(@extra_connection_options)
@@ -230,9 +232,17 @@ module Bosh::OpenStackCloud
         nics = network_configurator.nics
         @logger.debug("Using NICs: `#{nics.join(', ')}'")
 
-        image = with_openstack { @openstack.images.find { |i| i.id == stemcell_id } }
-        cloud_error("Image `#{stemcell_id}' not found") if image.nil?
-        @logger.debug("Using image: `#{stemcell_id}'")
+        image = nil
+        begin
+          Bosh::Common.retryable(@connect_retry_options) do |tries, error|
+            @logger.error("Unable to connect to OpenStack API to find image: `#{stemcell_id} due to: #{error.inspect}") unless error.nil?
+            image = with_openstack { @openstack.images.find { |i| i.id == stemcell_id } }
+            cloud_error("Image `#{stemcell_id}' not found") if image.nil?
+            @logger.debug("Using image: `#{stemcell_id}'")
+          end
+        rescue Bosh::Common::RetryCountExceeded, Excon::Errors::SocketError => e
+          cloud_error("Unable to connect to OpenStack API to find image: `#{stemcell_id}'")
+        end
 
         flavor = with_openstack { @openstack.flavors.find { |f| f.name == resource_pool['instance_type'] } }
         cloud_error("Flavor `#{resource_pool['instance_type']}' not found") if flavor.nil?
@@ -472,6 +482,20 @@ module Bosh::OpenStackCloud
       end
     end
 
+    ##
+    # Check whether an OpenStack volume exists or not
+    #
+    # @param [String] disk_id OpenStack volume UUID
+    # @return [bool] whether the specific disk is there or not
+    def has_disk?(disk_id)
+      with_thread_name("has_disk?(#{disk_id})") do
+        @logger.info("Check the presence of disk with id `#{disk_id}'...")
+        volume = with_openstack { @openstack.volumes.get(disk_id) }
+
+        !volume.nil?
+      end
+    end
+
     ##
     # Deletes an OpenStack volume
     #
@@ -532,9 +556,11 @@ module Bosh::OpenStackCloud
         cloud_error("Server `#{server_id}' not found") unless server
 
         volume = with_openstack { @openstack.volumes.get(disk_id) }
-        cloud_error("Volume `#{disk_id}' not found") unless volume
-
-        detach_volume(server, volume)
+        if volume.nil?
+          @logger.info("Disk `#{disk_id}' not found while trying to detach it from vm `#{server_id}'...")
+        else
+          detach_volume(server, volume)
+        end
 
         update_agent_settings(server) do |settings|
           settings['disks'] ||= {}
@@ -650,6 +676,7 @@ module Bosh::OpenStackCloud
         :openstack_username => @openstack_properties['username'],
         :openstack_api_key => @openstack_properties['api_key'],
         :openstack_tenant => @openstack_properties['tenant'],
+        :openstack_domain_name => @openstack_properties['domain'],
         :openstack_region => @openstack_properties['region'],
         :openstack_endpoint_type => @openstack_properties['endpoint_type'],
         :connection_options => @openstack_properties['connection_options'].merge(@extra_connection_options)
@@ -953,6 +980,7 @@ module Bosh::OpenStackCloud
             'username' => String,
             'api_key' => String,
             'tenant' => String,
+            optional('domain') => String,
             optional('region') => String,
             optional('endpoint_type') => String,
             optional('state_timeout') => Numeric,

data/lib/cloud/openstack/version.rb

@@ -3,6 +3,6 @@
 
 module Bosh
   module OpenStackCloud
-    VERSION = '1.3048.0'
+    VERSION = '1.3050.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_openstack_cpi
 version: !ruby/object:Gem::Version
-  version: 1.3048.0
+  version: 1.3050.0
 platform: ruby
 authors:
 - Piston Cloud Computing / VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -30,56 +30,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.27.0
+        version: 1.31.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.27.0
+        version: 1.31.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH OpenStack CPI
-  e2c11a
+  b92cdc
 email: support@cloudfoundry.com
 executables:
 - bosh_openstack_console