From 5b06cb265cf3004e809d0b0319530e8e179c6cdb Mon Sep 17 00:00:00 2001
From: Abhinav Dahiya <abhinav.dahiya@redhat.com>
Date: Wed, 20 Feb 2019 09:52:00 -0800
Subject: [PATCH] *: remove cluster_name from terraform config

All the resources now use `cluster_id` as the prefix and all the DNS records are created under `cluster_domain`.
Therefore there is no need for `cluster_name` in terraform configuration.
This also keep the calculation for the `clsuter_domain` in single location ie Go code outside of terraform.
---
 data/data/config.tf         |  6 +++---
 data/data/libvirt/main.tf   | 16 ++++++----------
 data/data/openstack/main.tf |  8 ++------
 pkg/asset/cluster/tfvars.go |  4 ++--
 pkg/tfvars/tfvars.go        | 14 +++++++-------
 5 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/data/data/config.tf b/data/data/config.tf
index 2dff8cf565e..08d9a2c06b7 100644
--- a/data/data/config.tf
+++ b/data/data/config.tf
@@ -34,12 +34,12 @@ This applies only to cloud platforms.
 EOF
 }
 
-variable "cluster_name" {
+variable "cluster_domain" {
   type = "string"
 
   description = <<EOF
-The name of the cluster.
-If used in a cloud-environment, this will be prepended to `base_domain` resulting in the URL to the OpenShift console.
+The domain of the cluster.
+All the records for the cluster are created under this domain.
 
 Note: This field MUST be set manually prior to creating the cluster.
 EOF
diff --git a/data/data/libvirt/main.tf b/data/data/libvirt/main.tf
index d8aa70ecc4b..f5e6e730414 100644
--- a/data/data/libvirt/main.tf
+++ b/data/data/libvirt/main.tf
@@ -1,7 +1,3 @@
-locals {
-  cluster_domain = "${var.cluster_name}.${var.base_domain}"
-}
-
 provider "libvirt" {
   uri = "${var.libvirt_uri}"
 }
@@ -40,7 +36,7 @@ resource "libvirt_network" "net" {
   mode   = "nat"
   bridge = "${var.libvirt_network_if}"
 
-  domain = "${local.cluster_domain}"
+  domain = "${var.cluster_domain}"
 
   addresses = [
     "${var.machine_cidr}",
@@ -96,27 +92,27 @@ resource "libvirt_domain" "master" {
 data "libvirt_network_dns_host_template" "bootstrap" {
   count    = "${var.bootstrap_dns ? 1 : 0}"
   ip       = "${var.libvirt_bootstrap_ip}"
-  hostname = "api.${local.cluster_domain}"
+  hostname = "api.${var.cluster_domain}"
 }
 
 data "libvirt_network_dns_host_template" "masters" {
   count    = "${var.master_count}"
   ip       = "${var.libvirt_master_ips[count.index]}"
-  hostname = "api.${local.cluster_domain}"
+  hostname = "api.${var.cluster_domain}"
 }
 
 data "libvirt_network_dns_host_template" "etcds" {
   count    = "${var.master_count}"
   ip       = "${var.libvirt_master_ips[count.index]}"
-  hostname = "etcd-${count.index}.${local.cluster_domain}"
+  hostname = "etcd-${count.index}.${var.cluster_domain}"
 }
 
 data "libvirt_network_dns_srv_template" "etcd_cluster" {
   count    = "${var.master_count}"
   service  = "etcd-server-ssl"
   protocol = "tcp"
-  domain   = "${local.cluster_domain}"
+  domain   = "${var.cluster_domain}"
   port     = 2380
   weight   = 10
-  target   = "etcd-${count.index}.${local.cluster_domain}"
+  target   = "etcd-${count.index}.${var.cluster_domain}"
 }
diff --git a/data/data/openstack/main.tf b/data/data/openstack/main.tf
index e28f5f6209b..c0b7984d866 100644
--- a/data/data/openstack/main.tf
+++ b/data/data/openstack/main.tf
@@ -1,7 +1,3 @@
-locals {
-  cluster_domain = "${var.cluster_name}.${var.base_domain}"
-}
-
 provider "openstack" {
   auth_url            = "${var.openstack_credentials_auth_url}"
   cert                = "${var.openstack_credentials_cert}"
@@ -32,7 +28,7 @@ module "service" {
 
   swift_container   = "${openstack_objectstorage_container_v1.container.name}"
   cluster_id        = "${var.cluster_id}"
-  cluster_domain    = "${var.base_domain}"
+  cluster_domain    = "${var.cluster_domain}"
   image_name        = "${var.openstack_base_image}"
   flavor_name       = "${var.openstack_master_flavor_name}"
   ignition          = "${var.ignition_bootstrap}"
@@ -81,7 +77,7 @@ module "topology" {
 }
 
 resource "openstack_objectstorage_container_v1" "container" {
-  name = "${local.cluster_domain}"
+  name = "${var.cluster_domain}"
 
   # "kubernetes.io/cluster/${var.cluster_id}" = "owned"
   metadata = "${merge(map(
diff --git a/pkg/asset/cluster/tfvars.go b/pkg/asset/cluster/tfvars.go
index c701b7613f0..01faf2e02db 100644
--- a/pkg/asset/cluster/tfvars.go
+++ b/pkg/asset/cluster/tfvars.go
@@ -79,8 +79,8 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error {
 	masters := mastersAsset.Machines()
 	masterCount := len(masters)
 	data, err := tfvars.TFVars(
-		clusterID.UUID,
-		installConfig.Config.ObjectMeta.Name,
+		clusterID.InfraID,
+		installConfig.Config.ClusterDomain(),
 		installConfig.Config.BaseDomain,
 		&installConfig.Config.Networking.MachineCIDR.IPNet,
 		bootstrapIgn,
diff --git a/pkg/tfvars/tfvars.go b/pkg/tfvars/tfvars.go
index c61a422b83f..246d9424e5e 100644
--- a/pkg/tfvars/tfvars.go
+++ b/pkg/tfvars/tfvars.go
@@ -7,21 +7,21 @@ import (
 )
 
 type config struct {
-	ClusterID   string `json:"cluster_id,omitempty"`
-	Name        string `json:"cluster_name,omitempty"`
-	BaseDomain  string `json:"base_domain,omitempty"`
-	MachineCIDR string `json:"machine_cidr"`
-	Masters     int    `json:"master_count,omitempty"`
+	ClusterID     string `json:"cluster_id,omitempty"`
+	ClusterDomain string `json:"cluster_domain,omitempty"`
+	BaseDomain    string `json:"base_domain,omitempty"`
+	MachineCIDR   string `json:"machine_cidr"`
+	Masters       int    `json:"master_count,omitempty"`
 
 	IgnitionBootstrap string `json:"ignition_bootstrap,omitempty"`
 	IgnitionMaster    string `json:"ignition_master,omitempty"`
 }
 
 // TFVars generates terraform.tfvar JSON for launching the cluster.
-func TFVars(clusterID string, clusterName string, baseDomain string, machineCIDR *net.IPNet, bootstrapIgn string, masterIgn string, masterCount int) ([]byte, error) {
+func TFVars(clusterID string, clusterDomain string, baseDomain string, machineCIDR *net.IPNet, bootstrapIgn string, masterIgn string, masterCount int) ([]byte, error) {
 	config := &config{
 		ClusterID:         clusterID,
-		Name:              clusterName,
+		ClusterDomain:     clusterDomain,
 		BaseDomain:        baseDomain,
 		MachineCIDR:       machineCIDR.String(),
 		Masters:           masterCount,