From fa0a894ebcfa13a147ac45845f5a3cf7861e4dd4 Mon Sep 17 00:00:00 2001 From: ENIX NOC Date: Sat, 11 Mar 2023 18:26:22 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20OpenStack=20pool=20and=20externa?= =?UTF-8?q?l=5Fnetwork=5Fid=20are=20now=20variables?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- prepare-vms/terraform/openstack/machines.tf | 3 +-- prepare-vms/terraform/openstack/network.tf | 2 +- prepare-vms/terraform/openstack/variables.tf | 10 ++++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/prepare-vms/terraform/openstack/machines.tf b/prepare-vms/terraform/openstack/machines.tf index b0d42eaa..8f5c47ac 100644 --- a/prepare-vms/terraform/openstack/machines.tf +++ b/prepare-vms/terraform/openstack/machines.tf @@ -14,8 +14,7 @@ resource "openstack_compute_instance_v2" "machine" { resource "openstack_compute_floatingip_v2" "machine" { count = var.how_many_nodes - # This is something provided to us by Enix when our tenant was provisioned. - pool = "Public Floating" + pool = var.pool } resource "openstack_compute_floatingip_associate_v2" "machine" { diff --git a/prepare-vms/terraform/openstack/network.tf b/prepare-vms/terraform/openstack/network.tf index 0b6f8c2c..849de079 100644 --- a/prepare-vms/terraform/openstack/network.tf +++ b/prepare-vms/terraform/openstack/network.tf @@ -12,7 +12,7 @@ resource "openstack_networking_subnet_v2" "internal" { resource "openstack_networking_router_v2" "router" { name = var.prefix - external_network_id = "15f0c299-1f50-42a6-9aff-63ea5b75f3fc" + external_network_id = var.external_network_id } resource "openstack_networking_router_interface_v2" "router_internal" { diff --git a/prepare-vms/terraform/openstack/variables.tf b/prepare-vms/terraform/openstack/variables.tf index b4f3b8d2..5d19b3fc 100644 --- a/prepare-vms/terraform/openstack/variables.tf +++ b/prepare-vms/terraform/openstack/variables.tf @@ -14,3 +14,13 @@ variable "image" { type = string default = "Ubuntu 22.04" } + +// For example: "Public training floating" +variable "pool" { + type = string +} + +// For example: "74e32174-cf09-452f-bda0-2bdfe074e251" +variable "external_network_id" { + type = string +}