Remove domain name from dns config (#31)

Fixes #29 Signed-off-by: Yussuf Shaikh <yussuf@us.ibm.com>
ocp-power-automation · Jul 29, 2020 · f34c667 · f34c667
1 parent 75b1214
commit f34c667
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/modules/4_nodes/nodes.tf b/modules/4_nodes/nodes.tf
@@ -58,7 +58,7 @@ data "ignition_file" "b_hostname" {
     path        = "/etc/hostname"
     content {
         content = <<EOF
-bootstrap.${var.cluster_id}.${var.cluster_domain}
+bootstrap
 EOF
     }
 }
@@ -69,7 +69,7 @@ data "ignition_file" "m_hostname" {
     path        = "/etc/hostname"
     content {
     content     = <<EOF
-master-${count.index}.${var.cluster_id}.${var.cluster_domain}
+master-${count.index}
 EOF
     }
 }
@@ -81,7 +81,7 @@ data "ignition_file" "w_hostname" {
 
     content {
     content     = <<EOF
-worker-${count.index}.${var.cluster_id}.${var.cluster_domain}
+worker-${count.index}
 EOF
     }
 }

diff --git a/modules/5_install/install.tf b/modules/5_install/install.tf
@@ -33,20 +33,20 @@ locals {
         bootstrap_info  = {
             ip = var.bootstrap_ip,
             mac = var.bootstrap_mac,
-            name = "bootstrap.${var.cluster_id}.${var.cluster_domain}"
+            name = "bootstrap"
         }
         master_info     = [ for ix in range(length(var.master_ips)) :
             {
                 ip = var.master_ips[ix],
                 mac = var.master_macs[ix],
-                name = "master-${ix}.${var.cluster_id}.${var.cluster_domain}"
+                name = "master-${ix}"
             }
         ]
         worker_info     = [ for ix in range(length(var.worker_ips)) :
             {
                 ip = var.worker_ips[ix],
                 mac = var.worker_macs[ix],
-                name = "worker-${ix}.${var.cluster_id}.${var.cluster_domain}"
+                name = "worker-${ix}"
             }
         ]