Use checkout level for ocp4-playbooks (#2)

README.md

@@ -70,6 +70,7 @@ Edit the var.tfvars file with following values:
  * `installer_log_level` : enable log level for openshift-install (e.g. "debug | info | warn | error") (default "info")
  * `ansible_extra_options` : Ansible options to append to the ansible-playbook commands. Default is set to "-v".
  * `helpernode_tag` : Checkout level for [ocp4-helpernode](https://github.com/RedHatOfficial/ocp4-helpernode) which is used for setting up services required on bastion node.
+ * `install_playbook_tag` : Checkout level for [ocp4-playbooks](https://github.com/ocp-power-automation/ocp4-playbooks) which is used for running ocp4 installations steps.
  * `pull_secret_file` : Location of the pull-secret file to be used.
  * `cluster_domain` : Cluster domain name. cluster_id.cluster_domain together form the fully qualified domain name.
  * `cluster_id_prefix` : Cluster identifier. Should not be more than 8 characters. Nodes are pre-fixed with this value, please keep it unique (may be with your name).

modules/5_install/install.tf

@@ -121,6 +121,7 @@ resource "null_resource" "install" {
             "rm -rf ocp4-playbooks",
             "echo 'Cloning into ocp4-playbooks...'",
             "git clone https://github.com/ocp-power-automation/ocp4-playbooks --quiet",
+            "cd ocp4-playbooks && git checkout ${var.install_playbook_tag}"
         ]
     }
     provisioner "file" {

modules/5_install/variables.tf

@@ -54,6 +54,7 @@ variable "pull_secret" {}
 variable "release_image_override" {}
 
 variable helpernode_tag { default = "master" }
+variable install_playbook_tag { default = "master" }
 
 variable "storage_type" {}
 variable "log_level" {}

ocp.tf

@@ -94,6 +94,7 @@ module "install" {
     storage_type                    = var.storage_type
     release_image_override          = var.release_image_override
     helpernode_tag                  = var.helpernode_tag
+    install_playbook_tag            = var.install_playbook_tag
     log_level                       = var.installer_log_level
     ansible_extra_options           = var.ansible_extra_options
 }

variables.tf

@@ -148,6 +148,12 @@ variable "helpernode_tag" {
     default = "fddbbc651153ef2966e5cb4d4167990b31c01ceb"
 }
 
+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 = "90c7cc478c8751d0b22c163e101a0d49e15e2e08"
+}
+
 variable "ansible_extra_options" {
     description = "Extra options string to append to ansible-playbook commands"
     default     = "-v"