From 1fda0ec363e6aa554da9022e49cd3d4fbfb10607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Wed, 13 Mar 2024 15:26:33 +0000
Subject: [PATCH] Site name prefix for internal hostnames in terraform
---
cesnet-mcc/terraform/terraform.tfvars | 1 +
cesnet-mcc/terraform/vars.tf | 5 +++++
cesnet-mcc/terraform/vms.tf | 8 ++++----
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/cesnet-mcc/terraform/terraform.tfvars b/cesnet-mcc/terraform/terraform.tfvars
index 7c8ffc7..a6a30f4 100644
--- a/cesnet-mcc/terraform/terraform.tfvars
+++ b/cesnet-mcc/terraform/terraform.tfvars
@@ -2,6 +2,7 @@
ip_pool = "public-muni-147-251-124-GROUP"
net_name = "group-project-network"
net6_name = "public-muni-v6-432"
+site_name = "cesnet-mcc"
# These may need some adjustment for your provider
master_cpus = 2 # 2 CPUs to match existing flavours
diff --git a/cesnet-mcc/terraform/vars.tf b/cesnet-mcc/terraform/vars.tf
index 1ca3b86..2e39ee9 100644
--- a/cesnet-mcc/terraform/vars.tf
+++ b/cesnet-mcc/terraform/vars.tf
@@ -13,6 +13,11 @@ variable "net6_name" {
description = "The name of the IPv6 network"
}
+variable "site_name" {
+ type = string
+ description = "Site identifier for internal host names"
+}
+
variable "master_cpus" {
type = number
description = "Number of CPUs for the master"
diff --git a/cesnet-mcc/terraform/vms.tf b/cesnet-mcc/terraform/vms.tf
index 4cb2bd3..bbcc52a 100644
--- a/cesnet-mcc/terraform/vms.tf
+++ b/cesnet-mcc/terraform/vms.tf
@@ -100,7 +100,7 @@ data "openstack_compute_flavor_v2" "worker-flavor" {
}
resource "openstack_compute_instance_v2" "master" {
- name = "k8s-master"
+ name = "k8s-${var.site_name}-master"
image_id = data.openstack_images_image_v2.ubuntu.id
# 4 cores 4 GB RAM
flavor_id = data.openstack_compute_flavor_v2.master-flavor.id
@@ -116,7 +116,7 @@ resource "openstack_compute_instance_v2" "master" {
}
resource "openstack_compute_instance_v2" "nfs" {
- name = "k8s-nfs"
+ name = "k8s-${var.site_name}-nfs"
image_id = data.openstack_images_image_v2.ubuntu.id
flavor_id = data.openstack_compute_flavor_v2.worker-flavor.id
security_groups = ["default", openstack_compute_secgroup_v2.ping.name, openstack_compute_secgroup_v2.ssh.name]
@@ -131,7 +131,7 @@ resource "openstack_compute_instance_v2" "nfs" {
}
resource "openstack_compute_instance_v2" "ingress" {
- name = "k8s-w-ingress"
+ name = "k8s-${var.site_name}-w-ingress"
image_id = data.openstack_images_image_v2.ubuntu.id
flavor_id = data.openstack_compute_flavor_v2.worker-flavor.id
security_groups = ["default", openstack_compute_secgroup_v2.ping.name, openstack_compute_secgroup_v2.ssh.name, openstack_compute_secgroup_v2.http.name]
@@ -147,7 +147,7 @@ resource "openstack_compute_instance_v2" "ingress" {
resource "openstack_compute_instance_v2" "worker" {
count = var.extra_workers
- name = "k8s-worker-${count.index}"
+ name = "k8s-${var.site_name}-worker-${count.index}"
image_id = data.openstack_images_image_v2.ubuntu.id
flavor_id = data.openstack_compute_flavor_v2.worker-flavor.id
security_groups = ["default", openstack_compute_secgroup_v2.ping.name, openstack_compute_secgroup_v2.ssh.name]
--
GitLab