From 459f8294472aaadbd2f0a89da903d6ad2447a9bd Mon Sep 17 00:00:00 2001 From: Jay Rishel Date: Thu, 16 Aug 2018 16:07:28 -0400 Subject: [PATCH 1/2] update pumsu added fix for some puppet modules uploading not showing up in satellite GUI after running pumsu, specifically specifying the product upload is puppet --- pumsu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pumsu b/pumsu index ee49d49..985e146 100755 --- a/pumsu +++ b/pumsu @@ -176,8 +176,8 @@ def main(): # upload the modules print("[*] uploading modules") if debug: - print("[d] executing: hammer respository upload-content --id %s --path %s" % (repo, out_dir)) - upload_modules = subprocess.Popen("hammer repository upload-content --id %s --path %s" % (repo, out_dir) , shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + print("[d] executing: hammer respository upload-content --id %s --product puppet --path %s" % (repo, out_dir)) + upload_modules = subprocess.Popen("hammer repository upload-content --id %s --product puppet --path %s" % (repo, out_dir) , shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) (upload_output, upload_errors) = upload_modules.communicate() upload_modules.wait() print(upload_output) From 63016042f19c59dbc5c5a0b6cfb680be773c3a4f Mon Sep 17 00:00:00 2001 From: Jay Rishel Date: Mon, 29 Mar 2021 13:57:42 -0400 Subject: [PATCH 2/2] fixing puppet module build process to use pdk Satellite 6.8 and Puppet 5 no longer use the older command, using PDK --- pumsu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pumsu b/pumsu index 9d1f11c..19a8020 100755 --- a/pumsu +++ b/pumsu @@ -165,7 +165,7 @@ def main(): for mod in modules: print("[*] building module: %s" % mod) os.chdir(mod) - module_build = subprocess.Popen(["puppet", "module", "build"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + module_build = subprocess.Popen(["pdk", "build", "--force"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) module_build.communicate() module_build.wait() copy(glob("pkg/*.tar.gz")[0], out_dir)