From 5de805991be3bbf7ee2ef1be235f0504d9543194 Mon Sep 17 00:00:00 2001
From: Tomas Sedovic <tomas@sedovic.cz>
Date: Wed, 5 Jun 2019 16:15:41 +0200
Subject: [PATCH] data/data/openstack: Remove cluster name servers

The convention for the fully-qualified names is
`master-$index.$cluster_name.$domain_name`, but the hostnames we were
setting were in the `$cluster_name-master-$index` format.

The master and bootstrap Ignition configs now drop the `$cluster_name`
prefix and only set the `master-$index` / `bootstrap` part.
---
 data/data/openstack/bootstrap/main.tf | 2 +-
 data/data/openstack/masters/main.tf   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/data/openstack/bootstrap/main.tf b/data/data/openstack/bootstrap/main.tf
index 7c456c2a1fe..7e3e47110c7 100644
--- a/data/data/openstack/bootstrap/main.tf
+++ b/data/data/openstack/bootstrap/main.tf
@@ -49,7 +49,7 @@ data "ignition_file" "hostname" {
 
   content {
     content = <<EOF
-${var.cluster_id}-bootstrap
+bootstrap
 EOF
 
   }
diff --git a/data/data/openstack/masters/main.tf b/data/data/openstack/masters/main.tf
index 1371d54ff09..9f42191d344 100644
--- a/data/data/openstack/masters/main.tf
+++ b/data/data/openstack/masters/main.tf
@@ -15,7 +15,7 @@ data "ignition_file" "hostname" {
 
   content {
     content = <<EOF
-${var.cluster_id}-master-${count.index}
+master-${count.index}
 EOF
 
   }