projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try with modules from master
[mirror/dsa-puppet.git]
/
3rdparty
/
modules
/
keystone
/
lib
/
puppet
/
type
/
keystone_user_role.rb
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
9ac24e3
..
502dc39
100644
(file)
--- 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) }
# 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
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
ensurable
newparam(:name, :namevar => true) do
- newvalues(/^\S+@\S+$/)
end
newproperty(:roles, :array_matching => :all) do
end
newproperty(:roles, :array_matching => :all) do
@@
-42,10
+42,4
@@
Puppet::Type.newtype(:keystone_user_role) do
autorequire(:service) do
['keystone']
end
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
end