diff --git a/cesnet-mcc/terraform/terraform.tfvars b/cesnet-mcc/terraform/terraform.tfvars index 7c8ffc779891dd0ad0da4ff6f60bd7fd41cecda7..a6a30f4168c86312d46c542bc49b7ab3927cee00 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 1ca3b863c74bfd31011410ad248dc589a2f190d7..2e39ee9f30d82f65f521c5083aa74b2d670bf2d4 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 4cb2bd3b3c177266aba723254bce0ec588a2dd24..bbcc52a7870917ce1d2ae637f40c0acdc600bd5a 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]