diff --git a/staging/terraform/terraform.tfvars b/staging/terraform/terraform.tfvars index e7f2d7692e2b2e1b3097122f26037db581e40c86..d1c9a0d1b74e376ce3e50fa3b6973eef5c527ec8 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 b0891ef0b1d27d96a6a58b447ca1a8b95a9691d3..797ce3fe68eb1c2b3f88c0ec052fb04ca71a3e79 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 43054dd2536754df11f95dd920ca7ed5f4b5c6f3..ff6f75b8b4c0492023bcb1017cd41c460169a7a4 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 e9f8fa18d9ebd0d71b4726880e683c540f296ea0..c1889c0c71bfa8a51615e2b7f620cca34789960c 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 } }