Revert "Add the posibility to tell openstack to use --os_cacert for keystone_tenant"

[dsa-puppet.git] / 3rdparty / modules / keystone / lib / puppet / provider / keystone_tenant / openstack.rb

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 ef15c50e6f48792bdcaf058dbf0535dab6cecc24..7d19fcef0a8dcffe74e2f865ce2af1f957c2b755 100644 (file)
--- 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],