bosh_openstack_cpi 1.2732.0 → 1.2739.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e496034c8207e60a568572d638a86c59d0ef63e2
-  data.tar.gz: af7a72c50e33892fcf8f5f45a14746051953075a
+  metadata.gz: ee4017a97b49dc2f34ddd078fc99feaa345f6cc3
+  data.tar.gz: 9e0d98ca439ee06d5dcb46482eaa6af6a7d9ad67
 SHA512:
-  metadata.gz: be3c8410a5e6edde7c0620865b97532292f56e41a326bddd2c35920748027d5168b0bf54b6b6648cf19136a026d10a21bc59f2fde3b93e9160f1fbe286cb36d3
-  data.tar.gz: 7cf41525139be33c7d6868eeb2a8f86887a357485881c5436489e1bf17bcaad726a640285a002fe581a1394a0deae8d7dc0c017fae6402013b54e457f7320a7f
+  metadata.gz: 17da6ca3cc2b06ba342604dea03121cf17ca00a00ce834fc606c06b369a6525b86815b4e42a85b2a65461fd97dca17c56465a1781650c324f1b87c2a937c7d08
+  data.tar.gz: ae55d354e839c650c4d074e53221c4c789c361c12dcca851b4578837db969698a4e2e8ad44a87b7eb70dcb4822c84b6f54430d7378884e0500ee347c4c37f870

data/lib/cloud/openstack/cloud.rb

@@ -7,6 +7,8 @@ module Bosh::OpenStackCloud
   class Cloud < Bosh::Cloud
     include Helpers
 
+    OPTION_KEYS = ['openstack', 'registry', 'agent']
+
     BOSH_APP_DIR = '/var/vcap/bosh'
     FIRST_DEVICE_NAME_LETTER = 'b'
 
@@ -24,7 +26,7 @@ module Bosh::OpenStackCloud
     # @option options [Hash] agent agent options
     # @option options [Hash] registry agent options
     def initialize(options)
-      @options = options.dup
+      @options = normalize_options(options)
 
       validate_options
       initialize_registry
@@ -253,7 +255,7 @@ module Bosh::OpenStackCloud
           @logger.debug("Using boot volume: `#{boot_vol_id}'")
         end
 
-        use_config_drive = @openstack_properties.fetch("use_config_drive", false)
+        use_config_drive = !!@openstack_properties.fetch("config_drive", nil)
 
         server_params = {
           :name => server_name,
@@ -800,6 +802,7 @@ module Bosh::OpenStackCloud
 
       letter.succ! if flavor_has_ephemeral_disk?(flavor)
       letter.succ! if flavor_has_swap_disk?(flavor)
+      letter.succ! if @openstack_properties['config_drive'] == 'disk'
       letter
     end
 
@@ -900,22 +903,35 @@ module Bosh::OpenStackCloud
     # @return [void]
     # @raise [ArgumentError] if options are not valid
     def validate_options
-      unless @options['openstack'].is_a?(Hash) &&
-          @options.has_key?('openstack') &&
-          @options['openstack']['auth_url'] &&
-          @options['openstack']['username'] &&
-          @options['openstack']['api_key'] &&
-          @options['openstack']['tenant']
-        raise ArgumentError, 'Invalid OpenStack configuration parameters'
-      end
-
-      unless @options.has_key?('registry') &&
-          @options['registry'].is_a?(Hash) &&
-          @options['registry']['endpoint'] &&
-          @options['registry']['user'] &&
-          @options['registry']['password']
-        raise ArgumentError, 'Invalid registry configuration parameters'
+      schema = Membrane::SchemaParser.parse do
+        {
+          'openstack' => {
+            'auth_url' => String,
+            'username' => String,
+            'api_key' => String,
+            'tenant' => String,
+            optional('region') => String,
+            optional('endpoint_type') => String,
+            optional('state_timeout') => Numeric,
+            optional('stemcell_public_visibility') => enum(String, bool),
+            optional('connection_options') => Hash,
+            optional('boot_from_volume') => bool,
+            optional('default_key_name') => String,
+            optional('default_security_groups') => [String],
+            optional('wait_resource_poll_interval') => Integer,
+            optional('config_drive') => enum('disk', 'cdrom'),
+          },
+          'registry' => {
+            'endpoint' => String,
+            'user' => String,
+            'password' => String,
+          },
+          optional('agent') => Hash,
+        }
       end
+      schema.validate(@options)
+    rescue Membrane::SchemaValidationError => e
+      raise ArgumentError, "Invalid OpenStack cloud properties: #{e.inspect}"
     end
 
     def initialize_registry
@@ -929,5 +945,34 @@ module Bosh::OpenStackCloud
                                              registry_password)
     end
 
+    def normalize_options(options)
+      unless options.kind_of?(Hash)
+        raise ArgumentError, "Invalid OpenStack cloud properties: Hash expected, received #{options}"
+      end
+      # we only care about two top-level fields
+      options = hash_filter(options.dup) { |key| OPTION_KEYS.include?(key) }
+      # nil values should be treated the same as missing keys (makes validating optional fields easier)
+      delete_entries_with_nil_keys(options)
+    end
+
+    def hash_filter(hash)
+      copy = {}
+      hash.each do |key, value|
+        copy[key] = value if yield(key)
+      end
+      copy
+    end
+
+    def delete_entries_with_nil_keys(options)
+      options.each do |key, value|
+        if value == nil
+          options.delete(key)
+        elsif value.kind_of?(Hash)
+          options[key] = delete_entries_with_nil_keys(value.dup)
+        end
+      end
+      options
+    end
+
   end
 end

data/lib/cloud/openstack/version.rb

@@ -3,6 +3,6 @@
 
 module Bosh
   module OpenStackCloud
-    VERSION = '1.2732.0'
+    VERSION = '1.2739.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_openstack_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2732.0
+  version: 1.2739.0
 platform: ruby
 authors:
 - Piston Cloud Computing / VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2732.0
+        version: 1.2739.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2732.0
+        version: 1.2739.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2732.0
+        version: 1.2739.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2732.0
+        version: 1.2739.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2732.0
+        version: 1.2739.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2732.0
+        version: 1.2739.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -94,9 +94,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.2
+- !ruby/object:Gem::Dependency
+  name: membrane
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 description: |-
   BOSH OpenStack CPI
-  f6dedd
+  0d77bd
 email: support@cloudfoundry.com
 executables:
 - bosh_openstack_console