diff --git a/README.md b/README.md index f4474d5..a67298a 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ Edit the var.tfvars file with following values: ## How-to run Terraform resources On your Terraform client machine: -1. `cd ocp4_upi_kvm` +1. `cd ocp4-upi-kvm` 1. `terraform init` 1. `terraform apply -var-file var.tfvars` diff --git a/var.tfvars b/var.tfvars index 589f55f..4a1f584 100644 --- a/var.tfvars +++ b/var.tfvars @@ -5,11 +5,11 @@ images_path = "/home/libvirt/openshift-images" ### Configure the Nodes details bastion_image = "http://remote_server/rhel-8.1-ppc64le-kvm.qcow2" -rhcos_image = "http://remote_server/rhcos-4.3.18-ppc64le-qemu.ppc64le.qcow2" -bastion = { memory = 4096, vcpu = 2 } +rhcos_image = "http://remote_server/rhcos-4.4.0-0.nightly-ppc64le-2020-05-08-093850-qemu.ppc64le.qcow2" +bastion = { memory = 8192, vcpu = 2 } bootstrap = { memory = 8192, vcpu = 4, count = 1 } -master = { memory = 8192, vcpu = 4, count = 3 } -worker = { memory = 8192, vcpu = 4, count = 2 } +master = { memory = 16384, vcpu = 4, count = 3 } +worker = { memory = 16384, vcpu = 4, count = 2 } network_cidr = "192.168.88.0/24" rhel_username = "root" rhel_password = "123456" @@ -21,8 +21,8 @@ rhel_subscription_username = "" rhel_subscription_password = "" ### OpenShift variables -openshift_install_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/4.3.18/openshift-install-linux.tar.gz" -openshift_client_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/4.3.18/openshift-client-linux.tar.gz" +openshift_install_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp-dev-preview/4.4.0-0.nightly-ppc64le-2020-06-02-231523/openshift-install-linux.tar.gz" +openshift_client_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp-dev-preview/4.4.0-0.nightly-ppc64le-2020-06-02-231523/openshift-client-linux.tar.gz" #release_image_override = "" @@ -34,8 +34,8 @@ dns_forwarders = "8.8.8.8; 8.8.4.4" installer_log_level = "info" ansible_extra_options = "-v" -## Currently master branch has support for ppc64le; We will use current(May 15, 2020) commit# which is stable. #helpernode_tag = "fddbbc651153ef2966e5cb4d4167990b31c01ceb" +#install_playbook_tag = "90c7cc478c8751d0b22c163e101a0d49e15e2e08" storage_type = "nfs" volume_size = "300" # Value in GB diff --git a/variables.tf b/variables.tf index bdbb908..7260168 100644 --- a/variables.tf +++ b/variables.tf @@ -52,7 +52,7 @@ variable "rhcos_image" { variable "bastion" { # only one node is supported default = { - memory = 4096 + memory = 8192 vcpu = 2 } } @@ -68,14 +68,14 @@ variable "bootstrap" { variable "master" { default = { count = 3 - memory = 8192 + memory = 16384 vcpu = 4 } } variable "worker" { default = { count = 2 - memory = 8192 + memory = 16384 vcpu = 4 } } @@ -171,11 +171,11 @@ locals { ### OpenShift variables ################################################################ variable "openshift_install_tarball" { - default = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/4.3.18/openshift-install-linux.tar.gz" + default = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp-dev-preview/4.4.0-0.nightly-ppc64le-2020-06-02-231523/openshift-install-linux.tar.gz" } variable "openshift_client_tarball" { - default = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/4.3.18/openshift-client-linux.tar.gz" + default = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp-dev-preview/4.4.0-0.nightly-ppc64le-2020-06-02-231523/openshift-client-linux.tar.gz" } variable "release_image_override" {