From 732de6573bf8d0347e237e583e3fe4729b94ec50 Mon Sep 17 00:00:00 2001
From: Yussuf Shaikh <yussuf@us.ibm.com>
Date: Wed, 4 Nov 2020 23:32:41 +0530
Subject: [PATCH] Support minimalistic 3-node OCP config (#66)

Fixes #65

Signed-off-by: Yussuf Shaikh <yussuf@us.ibm.com>
---
 docs/quickstart.md                                  | 2 +-
 modules/3_helpernode/templates/helpernode_vars.yaml | 5 +++++
 variables.tf                                        | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/quickstart.md b/docs/quickstart.md
index 6da8dca..e8169ea 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -51,7 +51,7 @@ Update the following variables specific to your cluster requirement. All the var
     * `memory` : Memory in MBs required for master nodes.
     * `vcpu` : Number of VCPUs to use for master  nodes.
     * `count` : Number of master nodes.
- * `worker` : Map of below parameters for worker hosts. (Atleaset 2 Workers are required for running router pods in HA mode)
+ * `worker` : Map of below parameters for worker hosts.
     * `memory` : Memory in MBs required for worker nodes.
     * `vcpu` : Number of VCPUs to use for worker nodes.
     * `count` : Number of worker nodes.
diff --git a/modules/3_helpernode/templates/helpernode_vars.yaml b/modules/3_helpernode/templates/helpernode_vars.yaml
index 3b0535f..f8f7477 100644
--- a/modules/3_helpernode/templates/helpernode_vars.yaml
+++ b/modules/3_helpernode/templates/helpernode_vars.yaml
@@ -28,12 +28,14 @@ masters:
     ipaddr: "${m.ip}"
     macaddr: "${m.mac}"
 %{ endfor ~}
+%{ if length(worker_info) > 0 }
 workers:
 %{ for w in worker_info ~}
   - name: "${w.name}"
     ipaddr: "${w.ip}"
     macaddr: "${w.mac}"
 %{ endfor ~}
+%{ endif }
 chronyconfig:
   enabled: ${chrony_config}
   content:
@@ -65,3 +67,6 @@ setup_registry:
   release_name: "ocp-release"
   release_tag: "${local_registry.ocp_release_tag}"
 %{ endif }
+
+# This is required for latest helpernode. TODO: Remove when https://github.com/RedHatOfficial/ocp4-helpernode/pull/140 is merged
+helm_source: "https://get.helm.sh/helm-v3.4.0-linux-ppc64le.tar.gz"
diff --git a/variables.tf b/variables.tf
index d879118..32be534 100644
--- a/variables.tf
+++ b/variables.tf
@@ -159,13 +159,13 @@ variable "installer_log_level" {
 variable "helpernode_tag" {
     description = "Set the branch/tag name or commit# for using ocp4-helpernode repo"
     # Checkout level for https://github.com/RedHatOfficial/ocp4-helpernode which is used for setting up services required on bastion node
-    default = "5eab3db53976bb16be582f2edc2de02f7510050d"
+    default = "dd8a0767c677fc862e45b6d70e5d04656ced5d28"
 }
 
 variable "install_playbook_tag" {
     description = "Set the branch/tag name or commit# for using ocp4-playbooks repo"
     # Checkout level for https://github.com/ocp-power-automation/ocp4-playbooks which is used for running ocp4 installations steps
-    default = "b988d620bd70284c7674e7a94e107c456c940dd0"
+    default = "c6e6038dba0856e621697c876bd3a65927f46166"
 }
 
 variable "ansible_extra_options" {