remove openshift_api_url var as it is not used

Signed-off-by: Paul Bastide <[email protected]>
IBM · Oct 17, 2023 · 7a5a42e · 7a5a42e
1 parent 57976f6
commit 7a5a42e
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 20 deletions.
diff --git a/main.tf b/main.tf
@@ -92,7 +92,6 @@ module "support" {
   connection_timeout   = var.connection_timeout
   rhel_username        = var.rhel_username
   bastion_public_ip    = var.powervs_bastion_ip
-  openshift_api_url    = var.openshift_api_url
   cidrs                = module.vpc_prepare.mac_vpc_subnets
   powervs_machine_cidr = var.powervs_machine_cidr
 }

diff --git a/modules/4_pvs_support/pvs_support.tf b/modules/4_pvs_support/pvs_support.tf
@@ -9,9 +9,10 @@ locals {
     rhel_username = var.rhel_username
   }
 
-  # you must use the api-int url so the bastion routes over the correct interface.
+  # you must use the api url so the bastion routes over the correct interface.
+  # Dev Note: should pull this out of the `oc` command and pull out of the bastion.
   helpernode_vars = {
-    openshift_machine_config_url = replace(var.openshift_api_url, ":6443", "")
+    openshift_machine_config_url =  "https://localhost"
   }
 
   cidrs = {

diff --git a/modules/4_pvs_support/variables.tf b/modules/4_pvs_support/variables.tf
@@ -7,7 +7,6 @@ variable "ssh_agent" {}
 variable "cidrs" {}
 variable "powervs_machine_cidr" {}
 variable "bastion_public_ip" {}
-variable "openshift_api_url" {}
 variable "private_key_file" {}
 variable "connection_timeout" {}
 variable "rhel_username" {}
diff --git a/scripts/create-var-file.sh b/scripts/create-var-file.sh
@@ -163,9 +163,6 @@ powervs_service_instance_id = "${POWERVS_SERVICE_INSTANCE_ID}"
 powervs_region              = "${POWERVS_REGION}"
 powervs_zone                = "${POWERVS_ZONE}"
 
-openshift_api_url        = "${OPENSHIFT_API_URL}"
-
-openshift_client_tarball = "${OPENSHIFT_CLIENT_TARBALL}"
 rhel_image_name  = "${RHEL_IMAGE_NAME}"
 rhcos_image_name = "${COREOS_NAME}"
 public_key_file  = "data/id_rsa.pub"

diff --git a/var.tfvars b/var.tfvars
@@ -16,9 +16,6 @@ powervs_service_instance_id = "<cloud_instance_ID>"
 powervs_region              = "<region>"
 powervs_zone                = "<zone>"
 
-# OpenShift Cluster
-openshift_api_url = "<openshift_cluster_API_URL>"
-
 # Required for ignition and automation to run.
 powervs_bastion_ip         = ""
 powervs_bastion_private_ip = ""

diff --git a/variables.tf b/variables.tf
@@ -63,16 +63,6 @@ variable "vpc_zone" {
   default     = ""
 }
 
-################################################################
-# The OpenShift Cluster details
-################################################################
-
-variable "openshift_api_url" {
-  type        = string
-  description = "The API URL of the OpenShift Cluster"
-  default     = "https://api.example.ocp-multiarch.xyz:6443"
-}
-
 ################################################################
 # Configure the PowerVS instance bastion details
 ################################################################