X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=blobdiff_plain;f=3rdparty%2Fmodules%2Fkeystone%2Flib%2Fpuppet%2Ftype%2Fkeystone_service.rb;fp=3rdparty%2Fmodules%2Fkeystone%2Flib%2Fpuppet%2Ftype%2Fkeystone_service.rb;h=a4be4edae8f45bb71034a794be50f1f1bcd4074b;hp=9b2c1d9d40c457755720bc303ffb9408410802cc;hb=71a236efd9f45828d875a0a5fd025108bb1dcada;hpb=52e13a709b5b959cd8995e7fa4f1b226bbe13a87

diff --git a/3rdparty/modules/keystone/lib/puppet/type/keystone_service.rb b/3rdparty/modules/keystone/lib/puppet/type/keystone_service.rb
index 9b2c1d9d..a4be4eda 100644
--- a/3rdparty/modules/keystone/lib/puppet/type/keystone_service.rb
+++ b/3rdparty/modules/keystone/lib/puppet/type/keystone_service.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_service) do
 
   desc 'This type can be used to manage keystone services.'
@@ -37,10 +38,4 @@ Puppet::Type.newtype(:keystone_service) do
   autorequire(:service) do
     ['keystone']
   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