bosh-registry 1.3115.0 → 1.3120.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f00d529566ed51b8965045687540780b9a2cf74a
-  data.tar.gz: ab16d1900c414a8a560f86b9dc44458239f62bd8
+  metadata.gz: f8b138c46152a2e700ef8342892291d5ea9e21a2
+  data.tar.gz: 4af5dc71fdcaedeb59147d995755e3053bc8cba6
 SHA512:
-  metadata.gz: 5126943c999c880f14f6feebb329fc9d236fac76f7af3356e98e3d3dc21fae97457d52a2fa74760291771789d8cc021178a102af0cdd6cf9423a75f4dffd25b1
-  data.tar.gz: 948daab985ff29ba120f96ee6fbef647dfefeec4605844b42fe1a6cd88e53d8ff8593d6b2fe78c7c564994d162231428f2cd2056dce9e0c73d94126eae453ffe
+  metadata.gz: f046d5a6e0a9a1f8ff407ae221a563a4cc940adfda019aecd74424caec33be07c7da10392087c4ba2a108ef0faea31a5f75d65030b051f05f5eb50a273336a4c
+  data.tar.gz: 426aed1e1cf6e90c154f96a57d61c03fd8e89dbee9a881aaa3a2f0c1f7c40685459ca64438d239fe8a3f2432a818ea5052af026797d4f13c71ccbc2d1a92b147

data/lib/bosh/registry/config.rb

@@ -25,13 +25,17 @@ module Bosh::Registry
 
       @db = connect_db(config["db"])
 
-      plugin = config["cloud"]["plugin"]
-      begin
-        require "bosh/registry/instance_manager/#{plugin}"
-      rescue LoadError
-        raise ConfigError, "Could not find Provider Plugin: #{plugin}"
+      if config.has_key?("cloud")
+        plugin = config["cloud"]["plugin"]
+        begin
+          require "bosh/registry/instance_manager/#{plugin}"
+        rescue LoadError
+          raise ConfigError, "Could not find Provider Plugin: #{plugin}"
+        end
+        @instance_manager = Bosh::Registry::InstanceManager.const_get(plugin.capitalize).new(config["cloud"])
+      else
+        @instance_manager = Bosh::Registry::InstanceManager.new
       end
-      @instance_manager = Bosh::Registry::InstanceManager.const_get(plugin.capitalize).new(config["cloud"])
     end
 
     def connect_db(db_config)
@@ -62,15 +66,16 @@ module Bosh::Registry
         raise ConfigError, "Database configuration is missing from config file"
       end
 
-      unless config.has_key?("cloud") && config["cloud"].is_a?(Hash)
-        raise ConfigError, "Cloud configuration is missing from config file"
-      end
+      if config.has_key?("cloud")
+        unless config["cloud"].is_a?(Hash)
+          raise ConfigError, "Cloud configuration is missing from config file"
+        end
 
-      if config["cloud"]["plugin"].nil?
-        raise ConfigError, "Cloud plugin is missing from config file"
+        if config["cloud"]["plugin"].nil?
+          raise ConfigError, "Cloud plugin is missing from config file"
+        end
       end
     end
 
   end
-
 end

data/lib/bosh/registry/errors.rb

@@ -17,4 +17,6 @@ module Bosh::Registry
 
   class InstanceError < Error; end
   class InstanceNotFound < Error; code(404); end
+
+  class NotImplemented < Error; end
 end

data/lib/bosh/registry/instance_manager.rb

@@ -38,6 +38,15 @@ module Bosh::Registry
       get_instance(instance_id).destroy
     end
 
+    ##
+    # Get the list of IPs belonging to this instance
+    # @param [String] instance_id instance id
+    def instance_ips(instance_id)
+      raise NotImplemented, "Default implementation of InstanceManager does not support " \
+                            "IPs retrieval. Create IaaS-specific subclass and override this method " \
+                            "if IPs verfication is needed."
+    end
+
     private
 
     def check_instance_ips(ip, instance_id)

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

@@ -14,7 +14,11 @@ module Bosh::Registry
         @openstack_properties = cloud_config['openstack']
 
         unless @openstack_properties['auth_url'].match(/\/tokens$/)
-          @openstack_properties['auth_url'] = @openstack_properties['auth_url'] + '/tokens'
+          if is_v3? @openstack_properties['auth_url']
+            @openstack_properties['auth_url'] = @openstack_properties['auth_url'] + '/auth/tokens'
+          else
+            @openstack_properties['auth_url'] = @openstack_properties['auth_url'] + '/tokens'
+          end
         end
 
         @openstack_options = {
@@ -49,7 +53,7 @@ module Bosh::Registry
             raise ConfigError, 'Invalid OpenStack configuration parameters'
           end
 
-        elsif cloud_config['openstack']['auth_url'].match(/v3(\.\d+)?/)
+        elsif is_v3? cloud_config['openstack']['auth_url']
           unless cloud_config['openstack']['domain'] && cloud_config['openstack']['project']
             raise ConfigError, 'Invalid OpenStack configuration parameters'
           end
@@ -75,6 +79,10 @@ module Bosh::Registry
         return (instance.private_ip_addresses + instance.floating_ip_addresses).compact
       end
 
+      private
+      def is_v3?(url)
+        url.match(/\/v3(?=\/|$)/)
+      end
     end
 
   end

data/lib/bosh/registry/version.rb

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

metadata

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