X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=3rdparty%2Fmodules%2Fkeystone%2Flib%2Fpuppet%2Ftype%2Fkeystone_endpoint.rb;fp=3rdparty%2Fmodules%2Fkeystone%2Flib%2Fpuppet%2Ftype%2Fkeystone_endpoint.rb;h=43c5eb2ea80379ec05296a331d6ebbffa698f844;hb=71a236efd9f45828d875a0a5fd025108bb1dcada;hp=4b0e6df9caaa679f66102f409b0692bd36c9fc26;hpb=52e13a709b5b959cd8995e7fa4f1b226bbe13a87;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/keystone/lib/puppet/type/keystone_endpoint.rb b/3rdparty/modules/keystone/lib/puppet/type/keystone_endpoint.rb
index 4b0e6df9c..43c5eb2ea 100644
--- a/3rdparty/modules/keystone/lib/puppet/type/keystone_endpoint.rb
+++ b/3rdparty/modules/keystone/lib/puppet/type/keystone_endpoint.rb
@@ -1,6 +1,7 @@
 # LP#1408531
 File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
-require 'puppet/util/openstack'
+File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
+
 Puppet::Type.newtype(:keystone_endpoint) do
 
   desc 'Type for managing keystone endpoints.'
@@ -38,10 +39,4 @@ Puppet::Type.newtype(:keystone_endpoint) do
     (region, service_name) = self[:name].split('/')
     [service_name]
   end
-
-  auth_param_doc=<<EOT
-If no other credentials are present, the provider will search in
-/etc/keystone/keystone.conf for an admin token and auth url.
-EOT
-  Puppet::Util::Openstack.add_openstack_type_methods(self, auth_param_doc)
 end