Skip to content

Commit e48afe2

Browse files
committed
feat(iac): Support network id input
1 parent cc0d83c commit e48afe2

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

deployment/terraform/examples/openstack-kubernetes/k3s-cluster/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module "openstack_cogstack_infra" {
1313
ubuntu_immage_name = var.ubuntu_immage_name
1414
# generate_random_name_prefix = false
1515
# prefix = "dev"
16-
# network = {
17-
# network_id = "some-id"
18-
# }
16+
network = {
17+
network_id = "some-id"
18+
}
1919
}

deployment/terraform/modules/openstack-kubernetes-infra/compute.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ data "openstack_compute_flavor_v2" "available_compute_flavors" {
124124

125125

126126
data "openstack_networking_network_v2" "network" {
127-
count = var.network.network_id != null ? 0 : 1
128-
name = var.network.name
127+
for_each = toset(var.network.network_id != null ? [] : ["lookup"])
128+
name = var.network.name
129129
}
130130

131131
data "openstack_images_image_v2" "ubuntu" {

deployment/terraform/modules/openstack-kubernetes-infra/shared-locals.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
locals {
33
random_prefix = random_id.server.b64_url
44
prefix = var.prefix != null ? var.prefix : (var.generate_random_name_prefix ? local.random_prefix : "")
5+
network_id = var.network.network_id != null ? var.network.network_id : data.openstack_networking_network_v2.network["lookup"].id
56
}
67

78

@@ -18,7 +19,6 @@ locals {
1819
locals {
1920
output_file_directory = var.output_file_directory != null ? var.output_file_directory : "${path.root}/.build"
2021
kubeconfig_file = "${local.output_file_directory}/downloaded-kubeconfig.yaml"
21-
network_id = var.network.network_id != null ? var.network.network_id : data.openstack_networking_network_v2.network[0].id
2222
}
2323

2424
resource "random_id" "server" {

0 commit comments

Comments
 (0)