Fixes ocp-power-automation#220 Wildcard move

torwen1 · Aug 24, 2021 · 04fb077 · 04fb077
1 parent f677382
commit 04fb077
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/modules/3_helpernode/helpernode.tf b/modules/3_helpernode/helpernode.tf
@@ -123,12 +123,15 @@ resource "null_resource" "prep_helpernode_tools_curl" {
         inline = [
             "mkdir -p .openshift",
             "rm -rf ocp4-helpernode",
+            "rm -rf ocp4-extract-helper",
+            "mkdir -p ocp4-extract-helper", 
             "echo 'Downloading ocp4-helpernode...'",
-            "curl -o ocp4-helpernode.zip ${var.helpernode_repo}",
+            "curl -o ocp4-extract-helper/ocp4-helpernode.zip ${var.helpernode_repo}",
             "echo 'Extracting ocp4-helpernode...'",
-            "unzip ocp4-helpernode.zip",
-            "mv ocp4-helpernode-master ocp4-helpernode",
-            "rm ocp4-helpernode.zip"
+            "cd ocp4-extract-helper && unzip ocp4-helpernode.zip",
+            "rm -rf ocp4-extract-helper/ocp4-helpernode.zip",
+            "mv ocp4-extract-helper/ocp4-helpernode* ocp4-helpernode",
+            "rm -rf ocp4-extract-helper"
         ]
     }
 }

diff --git a/modules/5_install/install.tf b/modules/5_install/install.tf
@@ -112,12 +112,15 @@ resource "null_resource" "prep_playbooks_tools_curl" {
     provisioner "remote-exec" {
         inline = [
             "rm -rf ocp4-playbooks",
+            "rm -rf ocp4-extract-helper",
+            "mkdir -p ocp4-extract-helper", 
             "echo 'Downloading ocp4-playbooks...'",
-            "curl -o ocp4-playbooks.zip ${var.install_playbook_repo}",
+            "curl -o ocp4-extract-helper/ocp4-playbooks.zip ${var.install_playbook_repo}",
             "echo 'Extracting ocp4-playbooks...'",
-            "unzip ocp4-playbooks.tar.gz",
-            "mv ocp4-playbooks-master ocp4-playbooks",
-            "rm ocp4-playbooks.tar.gz"
+            "cd ocp4-extract-helper && unzip ocp4-playbooks.zip",
+            "rm -rf ocp4-extract-helper/ocp4-playbooks.zip"
+            "mv ocp4-extract-helper/ocp4-playbooks* ocp4-playbooks",
+            "rm -rf ocp4-extract-helper"
         ]
     }
 }

diff --git a/var.tfvars b/var.tfvars
@@ -61,7 +61,7 @@ cluster_id                  = ""         # It will use random generated id with
 #helpernode_tag             = ""
 #install_playbook_repo      = "https://github.com/ocp-power-automation/ocp4-playbooks"
 #install_playbook_tag       = ""
-#helm_repo                 = "https://get.helm.sh/helm-v3.4.0-linux-ppc64le.tar.gz"
+#helm_repo                 = "https://get.helm.sh/helm-v3.6.3-linux-ppc64le.tar.gz"
 
 #installer_log_level        = "info"
 #ansible_extra_options      = "-v"

diff --git a/variables.tf b/variables.tf
@@ -280,7 +280,7 @@ variable "install_playbook_tag" {
 
 variable "helm_repo" {
     description = "Set the URL after http_server_repo_main_dir pointing to the Python helm modules"
-    default = "https://get.helm.sh/helm-v3.4.0-linux-ppc64le.tar.gz"
+    default = "https://get.helm.sh/helm-v3.6.3-linux-ppc64le.tar.gz"
 }
 
 variable "ansible_extra_options" {