try with modules from master

[dsa-puppet.git] / 3rdparty / modules / keystone / lib / puppet / type / keystone_role.rb

diff --git a/3rdparty/modules/keystone/lib/puppet/type/keystone_role.rb b/3rdparty/modules/keystone/lib/puppet/type/keystone_role.rb
index c6e7d1d45fbcb3444450a8d482f3cf87d2830799..3636afb279da9500f279f24ec540ce9b4cf8a35c 100644 (file)
--- a/3rdparty/modules/keystone/lib/puppet/type/keystone_role.rb
+++ b/3rdparty/modules/keystone/lib/puppet/type/keystone_role.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_role) do
 
   desc <<-EOT
@@ -24,10 +25,4 @@ Puppet::Type.newtype(:keystone_role) 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