bosh_openstack_cpi 1.2776.0 → 1.2778.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ef2c8cfeafc37da62687558b2ba755b037c0dc8
-  data.tar.gz: 5ee7a8ea4d09a65b0c582f0f87970cb9a7b47a08
+  metadata.gz: 4e9175b478f8388a3f147c73c162cc92b0338596
+  data.tar.gz: ba24e8d2ab6a76c7acf1770f2336a3d02f5f1150
 SHA512:
-  metadata.gz: 17ff9418b8d023c1fe0b3a062d22ecfc1a6c34ed78a17eda887fbaab0ebd26a55614bcd98fa9134c55f7958ad7e0241b06af980720f6760de0963d3ec045ba24
-  data.tar.gz: 80fe453b3bf6f21ae945bdc6705e73a275448ae50b347484c3b110be96f32609960fef9fa6009ba1b3b7e617aa4013e22d8d97aa6dd2012eac7632a6ad419020
+  metadata.gz: dee6227c51b368c23b3068d07fda3b6950dba6631d38bcf7be8997cc188f0a6ce1247a69167542485ab6e45c52c4d56c29fc0604c01164f37b3212f874f221c6
+  data.tar.gz: 804bfdeb2b4f6607aea0ae71b716ed16c194fc70f0ffed43e16afc13e4628a318c46b345c6662b5875c0e2f9521ab5301b742ebf668a8dd00c52ecc2a7b4f2af

data/lib/cloud/openstack/cloud.rb

@@ -42,6 +42,7 @@ module Bosh::OpenStackCloud
       @stemcell_public_visibility = @openstack_properties["stemcell_public_visibility"]
       @wait_resource_poll_interval = @openstack_properties["wait_resource_poll_interval"]
       @boot_from_volume = @openstack_properties["boot_from_volume"]
+      @boot_volume_cloud_properties = @openstack_properties["boot_volume_cloud_properties"] || {}
 
       unless @openstack_properties['auth_url'].match(/\/tokens$/)
         @openstack_properties['auth_url'] = @openstack_properties['auth_url'] + '/tokens'
@@ -87,12 +88,12 @@ module Bosh::OpenStackCloud
 
       volume_params = {
         :provider => "OpenStack",
-        :openstack_auth_url => @openstack_properties["auth_url"],
-        :openstack_username => @openstack_properties["username"],
-        :openstack_api_key => @openstack_properties["api_key"],
-        :openstack_tenant => @openstack_properties["tenant"],
+        :openstack_auth_url => @openstack_properties['auth_url'],
+        :openstack_username => @openstack_properties['username'],
+        :openstack_api_key => @openstack_properties['api_key'],
+        :openstack_tenant => @openstack_properties['tenant'],
         :openstack_region => @openstack_properties['region'],
-        :openstack_endpoint_type => @openstack_properties["endpoint_type"],
+        :openstack_endpoint_type => @openstack_properties['endpoint_type'],
         :connection_options => @openstack_properties['connection_options'].merge(extra_connection_options)
       }
       begin
@@ -249,14 +250,6 @@ module Bosh::OpenStackCloud
         cloud_error("Key-pair `#{keyname}' not found") if keypair.nil?
         @logger.debug("Using key-pair: `#{keypair.name}' (#{keypair.fingerprint})")
 
-        if @boot_from_volume
-          boot_vol_size = flavor.disk * 1024
-
-          boot_vol_id = create_boot_disk(boot_vol_size, stemcell_id)
-          cloud_error("Failed to create boot volume.") if boot_vol_id.nil?
-          @logger.debug("Using boot volume: `#{boot_vol_id}'")
-        end
-
         use_config_drive = !!@openstack_properties.fetch("config_drive", nil)
 
         server_params = {
@@ -274,6 +267,12 @@ module Bosh::OpenStackCloud
         server_params[:availability_zone] = availability_zone if availability_zone
 
         if @boot_from_volume
+          boot_vol_size = flavor.disk * 1024
+
+          boot_vol_id = create_boot_disk(boot_vol_size, stemcell_id, availability_zone, @boot_volume_cloud_properties)
+          cloud_error("Failed to create boot volume.") if boot_vol_id.nil?
+          @logger.debug("Using boot volume: `#{boot_vol_id}'")
+
           server_params[:block_device_mapping] = [{
                                                    :volume_size => "",
                                                    :volume_id => boot_vol_id,
@@ -391,17 +390,21 @@ module Bosh::OpenStackCloud
     #   this disk will be attached to
     # @return [String] OpenStack volume UUID
     def create_disk(size, cloud_properties, server_id = nil)
-      with_thread_name("create_disk(#{size}, #{server_id})") do
+      with_thread_name("create_disk(#{size}, #{cloud_properties}, #{server_id})") do
         raise ArgumentError, 'Disk size needs to be an integer' unless size.kind_of?(Integer)
         cloud_error('Minimum disk size is 1 GiB') if (size < 1024)
         cloud_error('Maximum disk size is 1 TiB') if (size > 1024 * 1000)
 
         volume_params = {
-          :name => "volume-#{generate_unique_name}",
-          :description => '',
+          :display_name => "volume-#{generate_unique_name}",
+          :display_description => '',
           :size => (size / 1024.0).ceil
         }
 
+        if cloud_properties.has_key?('type')
+          volume_params[:volume_type] = cloud_properties['type']
+        end
+
         if server_id
           server = with_openstack { @openstack.servers.get(server_id) }
           if server && server.availability_zone
@@ -410,12 +413,12 @@ module Bosh::OpenStackCloud
         end
 
         @logger.info('Creating new volume...')
-        volume = with_openstack { @openstack.volumes.create(volume_params) }
+        new_volume = with_openstack { @volume.volumes.create(volume_params) }
 
-        @logger.info("Creating new volume `#{volume.id}'...")
-        wait_resource(volume, :available)
+        @logger.info("Creating new volume `#{new_volume.id}'...")
+        wait_resource(new_volume, :available)
 
-        volume.id.to_s
+        new_volume.id.to_s
       end
     end
 
@@ -425,9 +428,11 @@ module Bosh::OpenStackCloud
     # @param [Integer] size disk size in MiB
     # @param [String] stemcell_id OpenStack image UUID that will be used to
     #   populate the boot volume
+    # @param [optional, String] availability_zone to be passed to the volume API
+    # @param [optional, String] volume_type to be passed to the volume API
     # @return [String] OpenStack volume UUID
-    def create_boot_disk(size, stemcell_id)
-      with_thread_name("create_boot_disk(#{size}, #{stemcell_id})") do
+    def create_boot_disk(size, stemcell_id, availability_zone = nil, boot_volume_cloud_properties = {})
+      with_thread_name("create_boot_disk(#{size}, #{stemcell_id}, #{availability_zone}, #{boot_volume_cloud_properties})") do
         raise ArgumentError, "Disk size needs to be an integer" unless size.kind_of?(Integer)
         cloud_error("Minimum disk size is 1 GiB") if (size < 1024)
         cloud_error("Maximum disk size is 1 TiB") if (size > 1024 * 1000)
@@ -438,6 +443,9 @@ module Bosh::OpenStackCloud
           :imageRef => stemcell_id
         }
 
+        volume_params[:availability_zone] = availability_zone if availability_zone
+        volume_params[:volume_type] = boot_volume_cloud_properties["type"] if boot_volume_cloud_properties["type"]
+
         @logger.info("Creating new boot volume...")
         boot_volume = with_openstack { @volume.volumes.create(volume_params) }
 

data/lib/cloud/openstack/version.rb

@@ -3,6 +3,6 @@
 
 module Bosh
   module OpenStackCloud
-    VERSION = '1.2776.0'
+    VERSION = '1.2778.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_openstack_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2776.0
+  version: 1.2778.0
 platform: ruby
 authors:
 - Piston Cloud Computing / VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2776.0
+        version: 1.2778.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2776.0
+        version: 1.2778.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2776.0
+        version: 1.2778.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2776.0
+        version: 1.2778.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2776.0
+        version: 1.2778.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2776.0
+        version: 1.2778.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ dependencies:
         version: 1.1.0
 description: |-
   BOSH OpenStack CPI
-  5aa001
+  6fc63f
 email: support@cloudfoundry.com
 executables:
 - bosh_openstack_console