From 1967eabaf6a29833c4dab3e5fd0aa781989828e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Fri, 14 Jun 2024 07:59:27 +0000
Subject: [PATCH] Terraform: build local network at PSNC
---
staging/terraform/terraform.tfvars | 1 -
staging/terraform/vars.tf | 5 -----
staging/terraform/versions.tf | 3 +++
staging/terraform/vms.tf | 13 +++++--------
4 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/staging/terraform/terraform.tfvars b/staging/terraform/terraform.tfvars
index e7f2d76..d1c9a0d 100644
--- a/staging/terraform/terraform.tfvars
+++ b/staging/terraform/terraform.tfvars
@@ -1,6 +1,5 @@
# These need to be defined for things to work
ip_pool = "PSNC-PUB1-EDU"
-net_name = "local-network"
site_name = "staging"
# These may need some adjustment for your provider
diff --git a/staging/terraform/vars.tf b/staging/terraform/vars.tf
index b0891ef..797ce3f 100644
--- a/staging/terraform/vars.tf
+++ b/staging/terraform/vars.tf
@@ -3,11 +3,6 @@ variable "ip_pool" {
description = "The name of the public IP pool for the servers"
}
-variable "net_name" {
- type = string
- description = "The name of the IPv4 network"
-}
-
variable "site_name" {
type = string
description = "Site identifier for internal host names"
diff --git a/staging/terraform/versions.tf b/staging/terraform/versions.tf
index 43054dd..ff6f75b 100644
--- a/staging/terraform/versions.tf
+++ b/staging/terraform/versions.tf
@@ -1,3 +1,6 @@
+provider "openstack" {
+}
+
terraform {
required_providers {
local = "~> 2.0"
diff --git a/staging/terraform/vms.tf b/staging/terraform/vms.tf
index e9f8fa1..c1889c0 100644
--- a/staging/terraform/vms.tf
+++ b/staging/terraform/vms.tf
@@ -1,6 +1,3 @@
-provider "openstack" {
-}
-
locals {
nodes = concat([
openstack_compute_instance_v2.ingress,
@@ -130,7 +127,7 @@ resource "openstack_compute_instance_v2" "master" {
user_data = file("cloud-init.yaml")
tags = ["master"]
network {
- name = var.net_name
+ uuid = openstack_networking_network_v2.local-network.id
}
}
@@ -142,7 +139,7 @@ resource "openstack_compute_instance_v2" "nfs" {
user_data = file("cloud-init.yaml")
tags = ["worker"]
network {
- name = var.net_name
+ uuid = openstack_networking_network_v2.local-network.id
}
}
@@ -154,7 +151,7 @@ resource "openstack_compute_instance_v2" "ingress" {
user_data = file("cloud-init.yaml")
tags = ["worker"]
network {
- name = var.net_name
+ uuid = openstack_networking_network_v2.local-network.id
}
}
@@ -167,7 +164,7 @@ resource "openstack_compute_instance_v2" "worker" {
user_data = file("cloud-init.yaml")
tags = ["worker"]
network {
- name = var.net_name
+ uuid = openstack_networking_network_v2.local-network.id
}
}
@@ -180,7 +177,7 @@ resource "openstack_compute_instance_v2" "gpu" {
user_data = file("cloud-init.yaml")
tags = ["worker"]
network {
- name = var.net_name
+ uuid = openstack_networking_network_v2.local-network.id
}
}
--
GitLab