bosh-registry 1.5.0.pre.1492 → 1.5.0.pre.1504

data/README.md

@@ -77,6 +77,8 @@ These are the credentials to connect to OpenStack services:
   OpenStack region
 * `endpoint_type` (optional)
   OpenStack endpoint type (publicURL (default), adminURL, internalURL)
+* `connection_options` (optional)
+  Hash containing optional connection parameters to the OpenStack API (`ssl_verify_peer`, `omit_default_port`, ...)
 
 ## Example
 

data/lib/bosh/registry/instance_manager/openstack.rb

@@ -11,20 +11,21 @@ module Bosh::Registry
 
         @logger = Bosh::Registry.logger
 
-        @openstack_properties = cloud_config["openstack"]
+        @openstack_properties = cloud_config['openstack']
 
-        unless @openstack_properties["auth_url"].match(/\/tokens$/)
-          @openstack_properties["auth_url"] = @openstack_properties["auth_url"] + "/tokens"
+        unless @openstack_properties['auth_url'].match(/\/tokens$/)
+          @openstack_properties['auth_url'] = @openstack_properties['auth_url'] + '/tokens'
         end
 
         @openstack_options = {
-          :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_region => @openstack_properties["region"],
-          :openstack_endpoint_type => @openstack_properties["endpoint_type"]
+          :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_region => @openstack_properties['region'],
+          :openstack_endpoint_type => @openstack_properties['endpoint_type'],
+          :connection_options => @openstack_properties['connection_options']
         }
       end
 
@@ -33,13 +34,13 @@ module Bosh::Registry
       end
       
       def validate_options(cloud_config)
-        unless cloud_config.has_key?("openstack") &&
-            cloud_config["openstack"].is_a?(Hash) &&
-            cloud_config["openstack"]["auth_url"] &&
-            cloud_config["openstack"]["username"] &&
-            cloud_config["openstack"]["api_key"] &&
-            cloud_config["openstack"]["tenant"]
-          raise ConfigError, "Invalid OpenStack configuration parameters"
+        unless cloud_config.has_key?('openstack') &&
+            cloud_config['openstack'].is_a?(Hash) &&
+            cloud_config['openstack']['auth_url'] &&
+            cloud_config['openstack']['username'] &&
+            cloud_config['openstack']['api_key'] &&
+            cloud_config['openstack']['tenant']
+          raise ConfigError, 'Invalid OpenStack configuration parameters'
         end
       end
 
@@ -66,4 +67,4 @@ module Bosh::Registry
 
   end
 
-end
+end

data/lib/bosh/registry/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Registry
-    VERSION = '1.5.0.pre.1492'
+    VERSION = '1.5.0.pre.1504'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-registry
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1492
+  version: 1.5.0.pre.1504
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -109,7 +109,7 @@ dependencies:
         version: 1.8.5
 description: ! 'BOSH Registry
 
-  966b08'
+  882c2b'
 email: support@cloudfoundry.com
 executables:
 - bosh-registry