bosh_openstack_cpi 1.2579.0 → 1.2583.0

data/lib/cloud/openstack/cloud.rb

@@ -13,6 +13,7 @@ module Bosh::OpenStackCloud
     attr_reader :openstack
     attr_reader :registry
     attr_reader :glance
+    attr_reader :volume
     attr_accessor :logger
 
     ##
@@ -33,11 +34,12 @@ module Bosh::OpenStackCloud
       @agent_properties = @options['agent'] || {}
       @openstack_properties = @options['openstack']
 
-      @default_key_name = @openstack_properties['default_key_name']
-      @default_security_groups = @openstack_properties['default_security_groups']
-      @state_timeout = @openstack_properties['state_timeout']
-      @stemcell_public_visibility = @openstack_properties['stemcell_public_visibility']
-      @wait_resource_poll_interval = @openstack_properties['wait_resource_poll_interval']
+      @default_key_name = @openstack_properties["default_key_name"]
+      @default_security_groups = @openstack_properties["default_security_groups"]
+      @state_timeout = @openstack_properties["state_timeout"]
+      @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"]
 
       unless @openstack_properties['auth_url'].match(/\/tokens$/)
         @openstack_properties['auth_url'] = @openstack_properties['auth_url'] + '/tokens'
@@ -77,6 +79,22 @@ module Bosh::OpenStackCloud
         cloud_error('Unable to connect to the OpenStack Image Service API. Check task debug log for details.')
       end
 
+      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_endpoint_type => @openstack_properties["endpoint_type"],
+        :connection_options => @openstack_properties['connection_options']
+      }
+      begin
+        @volume = Fog::Volume.new(volume_params)
+      rescue Exception => e
+        @logger.error(e)
+        cloud_error("Unable to connect to the OpenStack Volume API. Check task debug log for details.")
+      end
+
       @metadata_lock = Mutex.new
     end
 
@@ -222,6 +240,14 @@ 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
+
         server_params = {
           :name => server_name,
           :image_ref => image.id,
@@ -229,16 +255,26 @@ module Bosh::OpenStackCloud
           :key_name => keypair.name,
           :security_groups => security_groups,
           :nics => nics,
-          :user_data => Yajl::Encoder.encode(user_data(server_name, network_spec)),
-          :personality => [{
-                            'path' => "#{BOSH_APP_DIR}/user_data.json",
-                            'contents' => Yajl::Encoder.encode(user_data(server_name, network_spec, keypair.public_key))
-                          }]
+          :user_data => Yajl::Encoder.encode(user_data(server_name, network_spec))
         }
 
         availability_zone = select_availability_zone(disk_locality, resource_pool['availability_zone'])
         server_params[:availability_zone] = availability_zone if availability_zone
 
+        if @boot_from_volume
+          server_params[:block_device_mapping] = [{
+                                                   :volume_size => "",
+                                                   :volume_id => boot_vol_id,
+                                                   :delete_on_termination => "1",
+                                                   :device_name => "/dev/vda"
+                                                 }]
+        else
+          server_params[:personality] = [{
+                                          "path" => "#{BOSH_APP_DIR}/user_data.json",
+                                          "contents" => Yajl::Encoder.encode(user_data(server_name, network_spec, keypair.public_key))
+                                        }]
+        end
+
         @logger.debug("Using boot parms: `#{server_params.inspect}'")
         server = with_openstack { @openstack.servers.create(server_params) }
 
@@ -376,6 +412,35 @@ module Bosh::OpenStackCloud
       end
     end
 
+    ##
+    # Creates a new OpenStack boot volume
+    #
+    # @param [Integer] size disk size in MiB
+    # @param [String] stemcell_id OpenStack image UUID that will be used to
+    #   populate the boot volume
+    # @return [String] OpenStack volume UUID
+    def create_boot_disk(size, stemcell_id)
+      with_thread_name("create_boot_disk(#{size}, #{stemcell_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 = {
+          :display_name => "volume-#{generate_unique_name}",
+          :size => (size / 1024.0).ceil,
+          :imageRef => stemcell_id
+        }
+
+        @logger.info("Creating new boot volume...")
+        boot_volume = with_openstack { @volume.volumes.create(volume_params) }
+
+        @logger.info("Creating new boot volume `#{boot_volume.id}'...")
+        wait_resource(boot_volume, :available)
+
+        boot_volume.id.to_s
+      end
+    end
+
     ##
     # Deletes an OpenStack volume
     #
@@ -525,14 +590,6 @@ module Bosh::OpenStackCloud
       end
     end
 
-    ##
-    # Validates the deployment
-    #
-    # @note Not implemented in the OpenStack CPI
-    def validate_deployment(old_manifest, new_manifest)
-      not_implemented(:validate_deployment)
-    end
-
     ##
     # Selects the availability zone to use from a list of disk volumes,
     # resource pool availability zone (if any) and the default availability

data/lib/cloud/openstack/version.rb

@@ -3,6 +3,6 @@
 
 module Bosh
   module OpenStackCloud
-    VERSION = '1.2579.0'
+    VERSION = '1.2583.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_openstack_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2579.0
+  version: 1.2583.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2579.0
+        version: 1.2583.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2579.0
+        version: 1.2583.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2579.0
+        version: 1.2583.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2579.0
+        version: 1.2583.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2579.0
+        version: 1.2583.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2579.0
+        version: 1.2583.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
         version: 0.8.2
 description: ! 'BOSH OpenStack CPI
 
-  4fef83'
+  b96a92'
 email: support@cloudfoundry.com
 executables:
 - bosh_openstack_console
@@ -153,10 +153,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3384941327746268005
+      hash: -4384250625249937982
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: BOSH OpenStack CPI