X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fkeystone%2Flib%2Fpuppet%2Fprovider%2Fkeystone_tenant%2Fopenstack.rb;h=ef15c50e6f48792bdcaf058dbf0535dab6cecc24;hb=9323043aa25de76c23ba73489d575aecc7a8041d;hp=7d19fcef0a8dcffe74e2f865ce2af1f957c2b755;hpb=b8fa2c1a5ec9dbcd1d2f9e9b41afdde4c603aa35;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 7d19fcef..ef15c50e 100644 --- a/3rdparty/modules/keystone/lib/puppet/provider/keystone_tenant/openstack.rb +++ b/3rdparty/modules/keystone/lib/puppet/provider/keystone_tenant/openstack.rb @@ -58,7 +58,12 @@ Puppet::Type.type(:keystone_tenant).provide( end def self.instances - list = request('project', 'list', nil, nil, '--long') + 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.collect do |project| new( :name => project[:name], @@ -71,7 +76,12 @@ Puppet::Type.type(:keystone_tenant).provide( end def instances - instances = request('project', 'list', nil, resource[:auth], '--long') + 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.collect do |project| { :name => project[:name],