X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fkeystone%2Flib%2Fpuppet%2Ftype%2Fkeystone_user_role.rb;h=502dc39761cb4122e58ee54ad04986a518f9540f;hb=71a236efd9f45828d875a0a5fd025108bb1dcada;hp=9ac24e34e4515561e86f789dadebe354470186ba;hpb=52e13a709b5b959cd8995e7fa4f1b226bbe13a87;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/keystone/lib/puppet/type/keystone_user_role.rb b/3rdparty/modules/keystone/lib/puppet/type/keystone_user_role.rb
index 9ac24e34e..502dc3976 100644
--- a/3rdparty/modules/keystone/lib/puppet/type/keystone_user_role.rb
+++ b/3rdparty/modules/keystone/lib/puppet/type/keystone_user_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_user_role) do
 
   desc <<-EOT
@@ -15,7 +16,6 @@ Puppet::Type.newtype(:keystone_user_role) do
   ensurable
 
   newparam(:name, :namevar => true) do
-    newvalues(/^\S+@\S+$/)
   end
 
   newproperty(:roles,  :array_matching => :all) do
@@ -42,10 +42,4 @@ Puppet::Type.newtype(:keystone_user_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