X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=3rdparty%2Fmodules%2Fkeystone%2Flib%2Fpuppet%2Fprovider%2Fkeystone_tenant%2Fopenstack.rb;fp=3rdparty%2Fmodules%2Fkeystone%2Flib%2Fpuppet%2Fprovider%2Fkeystone_tenant%2Fopenstack.rb;h=7d19fcef0a8dcffe74e2f865ce2af1f957c2b755;hb=52e13a709b5b959cd8995e7fa4f1b226bbe13a87;hp=ef15c50e6f48792bdcaf058dbf0535dab6cecc24;hpb=9323043aa25de76c23ba73489d575aecc7a8041d;p=dsa-puppet.git diff --git a/3rdparty/modules/keystone/lib/puppet/provider/keystone_tenant/openstack.rb b/3rdparty/modules/keystone/lib/puppet/provider/keystone_tenant/openstack.rb index ef15c50e..7d19fcef 100644 --- a/3rdparty/modules/keystone/lib/puppet/provider/keystone_tenant/openstack.rb +++ b/3rdparty/modules/keystone/lib/puppet/provider/keystone_tenant/openstack.rb @@ -58,12 +58,7 @@ Puppet::Type.type(:keystone_tenant).provide( end def self.instances - if not resource[:os_cacert].nil? - resource_args = ['project', 'list', nil, nil, '--long', '--os-cacert', resource[:os_cacert]] - else - resource_args = ['project', 'list', nil, nil, '--long'] - end - list = request(resource_args) + list = request('project', 'list', nil, nil, '--long') list.collect do |project| new( :name => project[:name], @@ -76,12 +71,7 @@ Puppet::Type.type(:keystone_tenant).provide( end def instances - if not resource[:os_cacert].nil? - resource_args = ['project', 'list', nil, resource[:auth], '--long', '--os-cacert', resource[:os_cacert]] - else - resource_args = ['project', 'list', nil, resource[:auth], '--long'] - end - instances = request(resource_args) + instances = request('project', 'list', nil, resource[:auth], '--long') instances.collect do |project| { :name => project[:name],