Skip to content

feat: additional allowed addresses openstack #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devx merged 2 commits into from
Mar 10, 2026
Merged

feat: additional allowed addresses openstack #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ee9059
feat: additional allowed addresses openstack
mikeruu Mar 9, 2026
b10df5d
Merge branch 'main' into allowed-addr
devx Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions iac/cloud/openstack/openstack-nova/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ module "node_master" {
depends_on = [module.bastion, module.ssh-keypair, module.secgroup]
additional_block_devices = var.additional_block_devices_master
availability_zone = var.availability_zone
allowed_addresses = [var.vrrp_ip, var.subnet_nodes, var.subnet_pods, var.subnet_services]
allowed_addresses = concat([var.vrrp_ip, var.subnet_nodes, var.subnet_pods, var.subnet_services], var.additional_allowed_addresses_master)
flavor_name = var.size_master.flavor
image_id = var.image_id
image_name = var.image_name
Expand Down Expand Up @@ -100,7 +100,7 @@ module "node_worker" {
depends_on = [module.bastion, module.ssh-keypair, module.secgroup]
additional_block_devices = var.additional_block_devices_worker
availability_zone = var.availability_zone
allowed_addresses = [var.subnet_nodes, var.subnet_pods, var.subnet_services]
allowed_addresses = concat([var.subnet_nodes, var.subnet_pods, var.subnet_services], var.additional_allowed_addresses_worker)
flavor_name = var.size_worker.flavor
image_id = var.image_id
image_name = var.image_name
Expand Down Expand Up @@ -128,7 +128,7 @@ module "node_worker_windows" {
# count = var.size_worker_windows.count > 0 ? 1 : 0
depends_on = [module.bastion, module.secgroup]
availability_zone = var.availability_zone
allowed_addresses = [var.subnet_nodes, var.subnet_pods, var.subnet_services]
allowed_addresses = concat([var.subnet_nodes, var.subnet_pods, var.subnet_services], var.additional_allowed_addresses_worker)
flavor_name = var.size_worker_windows.flavor
image_id = var.image_id_windows
image_name = var.image_name
Expand Down Expand Up @@ -268,7 +268,7 @@ module "additional_worker_pools" {
flavor_name = each.value.flavor_worker
image_id = each.value.image_id
image_name = each.value.image_name
allowed_addresses = [var.subnet_nodes, var.subnet_pods, var.subnet_services]
allowed_addresses = concat([var.subnet_nodes, var.subnet_pods, var.subnet_services], var.additional_allowed_addresses_worker)

# Boot from volume configuration
node_bfv_volume_size = each.value.worker_node_bfv_volume_size
Expand Down Expand Up @@ -321,7 +321,7 @@ module "additional_worker_pools_windows" {
flavor_name = each.value.flavor_worker
image_id = each.value.image_id
image_name = each.value.image_name
allowed_addresses = length(each.value.allowed_addresses) > 0 ? each.value.allowed_addresses : [var.subnet_nodes, var.subnet_pods, var.subnet_services]
allowed_addresses = length(each.value.allowed_addresses) > 0 ? each.value.allowed_addresses : concat([var.subnet_nodes, var.subnet_pods, var.subnet_services], var.additional_allowed_addresses_worker)

# Boot from volume configuration (Windows uses different parameter names)
node_bfv_volume_size = each.value.worker_node_bfv_volume_size
Expand Down
12 changes: 12 additions & 0 deletions iac/cloud/openstack/openstack-nova/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,18 @@ variable "additional_ports_worker" {
default = [] # No rules created by default
}

variable "additional_allowed_addresses_master" {
description = "List of additional single IP addresses to add to master node allowed_address_pairs"
type = list(string)
default = []
}

variable "additional_allowed_addresses_worker" {
description = "List of additional single IP addresses to add to worker node allowed_address_pairs"
type = list(string)
default = []
}

variable "ansible_inventory_enabled" {
type = bool
default = false
Expand Down