Respect build_dir from resource

theforeman · Oct 10, 2023 · 2dbbd37 · 2dbbd37
1 parent 164fac0
commit 2dbbd37
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/lib/puppet/provider/ca/katello_ssl_tool.rb b/lib/puppet/provider/ca/katello_ssl_tool.rb
@@ -53,8 +53,4 @@ def files_to_deploy
     [pubkey]
   end
 
-  def self.privkey(name)
-    build_path("#{name}.key")
-  end
-
 end
diff --git a/lib/puppet/provider/cert/katello_ssl_tool.rb b/lib/puppet/provider/cert/katello_ssl_tool.rb
@@ -51,6 +51,6 @@ def req_file
   end
 
   def build_path(file_name = '')
-    self.class.build_path(File.join(resource[:hostname], file_name))
+    self.class.build_path(File.join(resource[:hostname], file_name), resource[:build_dir])
   end
 end
diff --git a/lib/puppet/provider/katello_ssl_tool.rb b/lib/puppet/provider/katello_ssl_tool.rb
@@ -47,9 +47,7 @@ def self.privkey(name)
     protected
 
     def katello_ssl_tool(*args)
-      Dir.chdir('/root') do
-        katello_ssl_tool_command(*args)
-      end
+      katello_ssl_tool_command(*args)
     end
 
     def generate!
@@ -154,11 +152,11 @@ def self.target_path(file_name = '')
     end
 
     def build_path(file_name = '')
-      self.class.build_path(file_name)
+      self.class.build_path(file_name, resource[:build_dir])
     end
 
-    def self.build_path(file_name = '')
-      File.join("/root/ssl-build", file_name)
+    def self.build_path(file_name = '', build_dir)
+      File.join(build_dir, file_name)
     end
 
     def ca_details