bosh_openstack_cpi 1.2820.0 → 1.2824.0

data/USAGE.md

@@ -34,6 +34,8 @@ The registry options are passed to the Openstack CPI by the BOSH director based
   default OpenStack ssh key name to assign to created virtual machines
 * `default_security_group` (required)
   default OpenStack security group to assign to created virtual machines
+* `ignore_server_availability_zone` (optional)
+  When creating a disk, do not use the availability zone of the server, fall back to Openstacks default. Commonly used if Ceph is used for block storage. Defaults to false.
 
 ### Registry options
 

data/lib/cloud/openstack.rb

@@ -31,6 +31,7 @@ require "cloud/openstack/dynamic_network"
 require "cloud/openstack/manual_network"
 require "cloud/openstack/vip_network"
 require "cloud/openstack/excon_logging_instrumentor"
+require "cloud/openstack/availability_zone_provider"
 require "cloud/openstack/redacted_params"
 
 module Bosh

data/lib/cloud/openstack/availability_zone_provider.rb

@@ -0,0 +1,43 @@
+module Bosh::OpenStackCloud
+  class AvailabilityZoneProvider
+    include Helpers
+
+    def initialize(openstack, ignore_server_availability_zone)
+      @openstack = openstack
+      @ignore_server_availability_zone = ignore_server_availability_zone
+    end
+
+    def select(volume_ids, resource_pool_az)
+      if volume_ids && !volume_ids.empty? && constrain_to_server_availability_zone?
+        fog_volume_map = @openstack.volumes
+        volumes = volume_ids.map { |vid| with_openstack { fog_volume_map.get(vid) } }
+        ensure_same_availability_zone(volumes, resource_pool_az)
+        volumes.first.availability_zone
+      else
+        resource_pool_az
+      end
+    end
+
+    def constrain_to_server_availability_zone?
+      !@ignore_server_availability_zone
+    end
+
+    private
+
+    ##
+    # Ensure all supplied availability zones are the same
+    #
+    # @param [Array] disks OpenStack volumes
+    # @param [String] default availability zone specified in
+    #   the resource pool (may be nil)
+    # @return [String] availability zone to use or nil
+    # @note this is a private method that is public to make it easier to test
+    def ensure_same_availability_zone(disks, default)
+      zones = disks.map { |disk| disk.availability_zone }
+      zones << default if default
+      zones.uniq!
+      cloud_error "can't use multiple availability zones: %s" %
+        zones.join(', ') unless zones.size == 1
+    end
+  end
+end

data/lib/cloud/openstack/cloud.rb

@@ -69,6 +69,10 @@ module Bosh::OpenStackCloud
         cloud_error('Unable to connect to the OpenStack Compute API. Check task debug log for details.')
       end
 
+      @az_provider = Bosh::OpenStackCloud::AvailabilityZoneProvider.new(
+        @openstack,
+        @openstack_properties["ignore_server_availability_zone"])
+
       glance_params = {
         :provider => 'OpenStack',
         :openstack_auth_url => @openstack_properties['auth_url'],
@@ -235,7 +239,7 @@ module Bosh::OpenStackCloud
           if flavor.ram
             # Ephemeral disk size should be at least the double of the vm total memory size, as agent will need:
             # - vm total memory size for swapon,
-            # - the rest for /vcar/vcap/data
+            # - the rest for /var/vcap/data
             min_ephemeral_size = (flavor.ram / 1024) * 2
             if flavor.ephemeral < min_ephemeral_size
               cloud_error("Flavor `#{resource_pool['instance_type']}' should have at least #{min_ephemeral_size}Gb " +
@@ -268,7 +272,7 @@ module Bosh::OpenStackCloud
           :user_data => Yajl::Encoder.encode(user_data(server_name, network_spec))
         }
 
-        availability_zone = select_availability_zone(disk_locality, resource_pool['availability_zone'])
+        availability_zone = @az_provider.select(disk_locality, resource_pool['availability_zone'])
         server_params[:availability_zone] = availability_zone if availability_zone
 
         if @boot_from_volume
@@ -410,7 +414,7 @@ module Bosh::OpenStackCloud
           volume_params[:volume_type] = cloud_properties['type']
         end
 
-        if server_id
+        if server_id  && @az_provider.constrain_to_server_availability_zone?
           server = with_openstack { @openstack.servers.get(server_id) }
           if server && server.availability_zone
             volume_params[:availability_zone] = server.availability_zone
@@ -448,7 +452,9 @@ module Bosh::OpenStackCloud
           :imageRef => stemcell_id
         }
 
-        volume_params[:availability_zone] = availability_zone if availability_zone
+        if availability_zone && @az_provider.constrain_to_server_availability_zone?
+          volume_params[:availability_zone] = availability_zone
+        end
         volume_params[:volume_type] = boot_volume_cloud_properties["type"] if boot_volume_cloud_properties["type"]
 
         @logger.info("Creating new boot volume...")
@@ -621,29 +627,7 @@ module Bosh::OpenStackCloud
     # @return [String] availability zone to use or nil
     # @note this is a private method that is public to make it easier to test
     def select_availability_zone(volumes, resource_pool_az)
-      if volumes && !volumes.empty?
-        disks = volumes.map { |vid| with_openstack { @openstack.volumes.get(vid) } }
-        ensure_same_availability_zone(disks, resource_pool_az)
-        disks.first.availability_zone
-      else
-        resource_pool_az
-      end
-    end
-
-    ##
-    # Ensure all supplied availability zones are the same
-    #
-    # @param [Array] disks OpenStack volumes
-    # @param [String] default availability zone specified in
-    #   the resource pool (may be nil)
-    # @return [String] availability zone to use or nil
-    # @note this is a private method that is public to make it easier to test
-    def ensure_same_availability_zone(disks, default)
-      zones = disks.map { |disk| disk.availability_zone }
-      zones << default if default
-      zones.uniq!
-      cloud_error "can't use multiple availability zones: %s" %
-        zones.join(', ') unless zones.size == 1 || zones.empty?
+      @az_provider.select(volumes, resource_pool_az)
     end
 
     private
@@ -989,6 +973,6 @@ module Bosh::OpenStackCloud
       end
       options
     end
-
   end
 end
+

data/lib/cloud/openstack/version.rb

@@ -3,6 +3,6 @@
 
 module Bosh
   module OpenStackCloud
-    VERSION = '1.2820.0'
+    VERSION = '1.2824.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_openstack_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2820.0
+  version: 1.2824.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2820.0
+        version: 1.2824.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2820.0
+        version: 1.2824.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.2820.0
+        version: 1.2824.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2820.0
+        version: 1.2824.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.2820.0
+        version: 1.2824.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2820.0
+        version: 1.2824.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -125,7 +125,7 @@ dependencies:
         version: 1.1.0
 description: ! 'BOSH OpenStack CPI
 
-  ebc2f0'
+  1607a8'
 email: support@cloudfoundry.com
 executables:
 - bosh_openstack_console
@@ -137,6 +137,7 @@ files:
 - bin/openstack_cpi
 - lib/bosh_openstack_cpi.rb
 - lib/cloud/openstack.rb
+- lib/cloud/openstack/availability_zone_provider.rb
 - lib/cloud/openstack/cloud.rb
 - lib/cloud/openstack/dynamic_network.rb
 - lib/cloud/openstack/excon_logging_instrumentor.rb
@@ -171,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1441481642216417872
+      hash: -1072403128542098218
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23