From 8489a387f3086d6ae65169a1a6a448b1cb08e57c Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Fri, 1 Mar 2019 16:56:41 +0000
Subject: [PATCH] baremetal: prefix resources with cluster_id

As per commit df57c7b77, cluster_id is now used to prefix resources in
other providers rather than cluster_name.
---
 data/data/baremetal/bootstrap/README.md    |  2 +-
 data/data/baremetal/bootstrap/main.tf      |  6 +++---
 data/data/baremetal/bootstrap/variables.tf |  4 ++--
 data/data/baremetal/main.tf                | 10 +++-------
 data/data/baremetal/volume/main.tf         |  2 +-
 data/data/baremetal/volume/variables.tf    |  4 ++--
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/data/data/baremetal/bootstrap/README.md b/data/data/baremetal/bootstrap/README.md
index f85d103fa..5dbaaf0a5 100644
--- a/data/data/baremetal/bootstrap/README.md
+++ b/data/data/baremetal/bootstrap/README.md
@@ -29,7 +29,7 @@ module "bootstrap" {
 
   addresses      = ["192.168.0.1"]
   base_volume_id = "${libvirt_volume.example.id}"
-  cluster_name   = "my-cluster"
+  cluster_id     = "my-cluster"
   ignition       = "{\"ignition\": {\"version\": \"2.2.0\"}}",
   network_id     = "${libvirt_network.example.id}"
 }
diff --git a/data/data/baremetal/bootstrap/main.tf b/data/data/baremetal/bootstrap/main.tf
index 84216a8dc..ca6956114 100644
--- a/data/data/baremetal/bootstrap/main.tf
+++ b/data/data/baremetal/bootstrap/main.tf
@@ -1,15 +1,15 @@
 resource "libvirt_volume" "bootstrap" {
-  name           = "${var.cluster_name}-bootstrap"
+  name           = "${var.cluster_id}-bootstrap"
   base_volume_id = "${var.base_volume_id}"
 }
 
 resource "libvirt_ignition" "bootstrap" {
-  name    = "${var.cluster_name}-bootstrap.ign"
+  name    = "${var.cluster_id}-bootstrap.ign"
   content = "${var.ignition}"
 }
 
 resource "libvirt_domain" "bootstrap" {
-  name = "${var.cluster_name}-bootstrap"
+  name = "${var.cluster_id}-bootstrap"
 
   memory = "4096"
 
diff --git a/data/data/baremetal/bootstrap/variables.tf b/data/data/baremetal/bootstrap/variables.tf
index 4b50f19e7..d3ed94986 100644
--- a/data/data/baremetal/bootstrap/variables.tf
+++ b/data/data/baremetal/bootstrap/variables.tf
@@ -3,9 +3,9 @@ variable "base_volume_id" {
   description = "The ID of the base volume for the bootstrap node."
 }
 
-variable "cluster_name" {
+variable "cluster_id" {
   type        = "string"
-  description = "The name of the cluster."
+  description = "The identifier for the cluster."
 }
 
 variable "ignition" {
diff --git a/data/data/baremetal/main.tf b/data/data/baremetal/main.tf
index b34fa8448..9609738fd 100644
--- a/data/data/baremetal/main.tf
+++ b/data/data/baremetal/main.tf
@@ -1,7 +1,3 @@
-locals {
-  cluster_domain = "${var.cluster_name}.${var.base_domain}"
-}
-
 provider "libvirt" {
   uri = "${var.libvirt_uri}"
 }
@@ -9,15 +5,15 @@ provider "libvirt" {
 module "volume" {
   source = "./volume"
 
-  cluster_name = "${var.cluster_name}"
-  image        = "${var.os_image}"
+  cluster_id = "${var.cluster_id}"
+  image      = "${var.os_image}"
 }
 
 module "bootstrap" {
   source = "./bootstrap"
 
   base_volume_id   = "${module.volume.coreos_base_volume_id}"
-  cluster_name     = "${var.cluster_name}"
+  cluster_id       = "${var.cluster_id}"
   ignition         = "${var.ignition_bootstrap}"
   baremetal_bridge = "${var.baremetal_bridge}"
   overcloud_bridge = "${var.overcloud_bridge}"
diff --git a/data/data/baremetal/volume/main.tf b/data/data/baremetal/volume/main.tf
index 6bdae7657..36f15b2b7 100644
--- a/data/data/baremetal/volume/main.tf
+++ b/data/data/baremetal/volume/main.tf
@@ -1,4 +1,4 @@
 resource "libvirt_volume" "coreos_base" {
-  name   = "${var.cluster_name}-base"
+  name   = "${var.cluster_id}-base"
   source = "${var.image}"
 }
diff --git a/data/data/baremetal/volume/variables.tf b/data/data/baremetal/volume/variables.tf
index 151bba7c8..aa6a277dd 100644
--- a/data/data/baremetal/volume/variables.tf
+++ b/data/data/baremetal/volume/variables.tf
@@ -1,6 +1,6 @@
-variable "cluster_name" {
+variable "cluster_id" {
   type        = "string"
-  description = "The name of the cluster."
+  description = "The identifier for the cluster."
 }
 
 variable "image" {