bosh-registry 1.3112.0 → 1.3115.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a04130085b4f28b5f97357a02c2a777ecff85f72
-  data.tar.gz: 3a63adab34a1c715e70a4637389bab62453a9b6d
+  metadata.gz: f00d529566ed51b8965045687540780b9a2cf74a
+  data.tar.gz: ab16d1900c414a8a560f86b9dc44458239f62bd8
 SHA512:
-  metadata.gz: cc7a7c163f5873fcab626918523c7c8397a2399241285161d7ac86d7c2ecccf5b321eeb9ff62f46a7da4384fbfee90c20b345f8b957a3f9161c5f377f0e5907c
-  data.tar.gz: 2ed9128dc7d814e966c98e6aaa408496a15859a428555502e6d66b9a6d7264b43367867cd22ebc803b434d53c9bb1eb4340b9bfd70a2983f5254e71ad70a8091
+  metadata.gz: 5126943c999c880f14f6feebb329fc9d236fac76f7af3356e98e3d3dc21fae97457d52a2fa74760291771789d8cc021178a102af0cdd6cf9423a75f4dffd25b1
+  data.tar.gz: 948daab985ff29ba120f96ee6fbef647dfefeec4605844b42fe1a6cd88e53d8ff8593d6b2fe78c7c564994d162231428f2cd2056dce9e0c73d94126eae453ffe

data/README.md

@@ -67,16 +67,18 @@ These are the credentials to connect to AWS services:
 
 These are the credentials to connect to OpenStack services:
 
-* `auth_url` (required)
+* `auth_url` (required, either API version 2 or version 3)
   URL of the OpenStack Identity endpoint to connect to
 * `username` (required)
   OpenStack user name
 * `api_key` (required)
   OpenStack API key
-* `tenant` (required)
+* `tenant` (required for API version 2)
   OpenStack tenant name
-* `domain` (optional)
-  OpenStack domain
+* `project` (required for API version 3)
+  OpenStack project name
+* `domain` (required for API version 3)
+  OpenStack domain name
 * `region` (optional)
   OpenStack region
 * `endpoint_type` (optional)

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

@@ -23,6 +23,7 @@ module Bosh::Registry
           :openstack_username => @openstack_properties['username'],
           :openstack_api_key => @openstack_properties['api_key'],
           :openstack_tenant => @openstack_properties['tenant'],
+          :openstack_project_name => @openstack_properties['project'],
           :openstack_domain_name => @openstack_properties['domain'],
           :openstack_region => @openstack_properties['region'],
           :openstack_endpoint_type => @openstack_properties['endpoint_type'],
@@ -33,16 +34,26 @@ module Bosh::Registry
       def openstack
         @openstack ||= Fog::Compute.new(@openstack_options)
       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']
+               cloud_config['openstack'].is_a?(Hash) &&
+               cloud_config['openstack']['auth_url'] &&
+               cloud_config['openstack']['username'] &&
+               cloud_config['openstack']['api_key']
           raise ConfigError, 'Invalid OpenStack configuration parameters'
         end
+
+        if cloud_config['openstack']['auth_url'].match(/v2(\.\d+)?/)
+          unless cloud_config['openstack']['tenant']
+            raise ConfigError, 'Invalid OpenStack configuration parameters'
+          end
+
+        elsif cloud_config['openstack']['auth_url'].match(/v3(\.\d+)?/)
+          unless cloud_config['openstack']['domain'] && cloud_config['openstack']['project']
+            raise ConfigError, 'Invalid OpenStack configuration parameters'
+          end
+        end
       end
 
       # Get the list of IPs belonging to this instance
@@ -51,7 +62,7 @@ module Bosh::Registry
         # going renew the fog connection one time to make sure that we get a new non-expired token.
         retried = false
         begin
-          instance  = openstack.servers.find { |s| s.name == instance_id }
+          instance = openstack.servers.find { |s| s.name == instance_id }
         rescue Excon::Errors::Unauthorized => e
           unless retried
             retried = true

data/lib/bosh/registry/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Registry
-    VERSION = '1.3112.0'
+    VERSION = '1.3115.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-registry
 version: !ruby/object:Gem::Version
-  version: 1.3112.0
+  version: 1.3115.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3112.0
+        version: 1.3115.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3112.0
+        version: 1.3115.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement