X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fkeystone%2Flib%2Fpuppet%2Fprovider%2Fkeystone.rb;h=4e7815abf75f3c595201620fb3affc219740541c;hb=71a236efd9f45828d875a0a5fd025108bb1dcada;hp=b398a8e308148ce9585af207310757c36a1b3f7a;hpb=4631045ebb77ee8622f6fa09277a50c372bcc02e;p=dsa-puppet.git

diff --git a/3rdparty/modules/keystone/lib/puppet/provider/keystone.rb b/3rdparty/modules/keystone/lib/puppet/provider/keystone.rb
index b398a8e3..4e7815ab 100644
--- a/3rdparty/modules/keystone/lib/puppet/provider/keystone.rb
+++ b/3rdparty/modules/keystone/lib/puppet/provider/keystone.rb
@@ -1,36 +1,33 @@
 require 'puppet/util/inifile'
 require 'puppet/provider/openstack'
+require 'puppet/provider/openstack/auth'
+require 'puppet/provider/openstack/credentials'
+
 class Puppet::Provider::Keystone < Puppet::Provider::Openstack
 
-  def request(service, action, object, credentials, *properties)
-    begin
-      super
-    rescue Puppet::Error::OpenstackAuthInputError => error
-      keystone_request(service, action, object, credentials, error, *properties)
-    end
-  end
+  extend Puppet::Provider::Openstack::Auth
 
-  def self.request(service, action, object, credentials, *properties)
-    begin
-      super
-    rescue Puppet::Error::OpenstackAuthInputError => error
-      keystone_request(service, action, object, credentials, error, *properties)
-    end
-  end
+  INI_FILENAME = '/etc/keystone/keystone.conf'
 
-  def keystone_request(service, action, object, credentials, error, *properties)
-    self.class.keystone_request(service, action, object, credentials, error, *properties)
+  def self.get_endpoint
+    endpoint = nil
+    if ENV['OS_AUTH_URL']
+      endpoint = ENV['OS_AUTH_URL']
+    else
+      endpoint = get_os_vars_from_rcfile(rc_filename)['OS_AUTH_URL']
+      unless endpoint
+        # This is from legacy but seems wrong, we want auth_url not url!
+        endpoint = get_admin_endpoint
+      end
+    end
+    unless endpoint
+      raise(Puppet::Error::OpenstackAuthInputError, 'Could not find auth url to check user password.')
+    end
+    endpoint
   end
 
-  def self.keystone_request(service, action, object, credentials, error, *properties)
-    credentials = {
-      'token'    => get_admin_token,
-      'auth_url' => get_admin_endpoint,
-    }
-    raise error unless (credentials['token'] && credentials['auth_url'])
-    auth_args = token_auth_args(credentials)
-    args = [object, properties, auth_args].flatten.compact
-    authenticate_request(service, action, args)
+  def self.admin_endpoint
+    @admin_endpoint ||= get_admin_endpoint
   end
 
   def self.admin_token
@@ -45,21 +42,12 @@ class Puppet::Provider::Keystone < Puppet::Provider::Openstack
     end
   end
 
-  def self.admin_endpoint
-    @admin_endpoint ||= get_admin_endpoint
-  end
-
-  def get_admin_token
-    self.class.get_admin_token
-  end
-
-
   def self.get_admin_endpoint
     if keystone_file
       if keystone_file['DEFAULT']
         if keystone_file['DEFAULT']['admin_endpoint']
           auth_url = keystone_file['DEFAULT']['admin_endpoint'].strip.chomp('/')
-          return "#{auth_url}/v2.0/"
+          return "#{auth_url}/v#{@credentials.version}/"
         end
 
         if keystone_file['DEFAULT']['admin_port']
@@ -87,22 +75,34 @@ class Puppet::Provider::Keystone < Puppet::Provider::Openstack
       end
     end
 
-    "#{protocol}://#{host}:#{admin_port}/v2.0/"
+    "#{protocol}://#{host}:#{admin_port}/v#{@credentials.version}/"
   end
 
-  def get_admin_endpoint
-    self.class.get_admin_endpoint
+  def self.request(service, action, properties=nil)
+    super
+    rescue Puppet::Error::OpenstackAuthInputError => error
+      request_by_service_token(service, action, error, properties)
   end
 
-  def self.keystone_file
-    return @keystone_file if @keystone_file
-    @keystone_file = Puppet::Util::IniConfig::File.new
-    @keystone_file.read('/etc/keystone/keystone.conf')
-    @keystone_file
+  def self.request_by_service_token(service, action, error, properties=nil)
+    properties ||= []
+    @credentials.token = get_admin_token
+    @credentials.url   = get_admin_endpoint
+    raise error unless @credentials.service_token_set?
+    Puppet::Provider::Openstack.request(service, action, properties, @credentials)
   end
 
-  def keystone_file
-    self.class.keystone_file
+  def self.ini_filename
+    INI_FILENAME
+  end
+
+  def self.keystone_file
+    return @keystone_file if @keystone_file
+    if File.exists?(ini_filename)
+      @keystone_file = Puppet::Util::IniConfig::File.new
+      @keystone_file.read(ini_filename)
+      @keystone_file
+    end
   end
 
   # Helper functions to use on the pre-validated enabled field
@@ -113,5 +113,4 @@ class Puppet::Provider::Keystone < Puppet::Provider::Openstack
   def sym_to_bool(sym)
     sym == :true ? true : false
   end
-
 end