From a14cdbb55ab5ebfde479c51c10bc9048541e0adb Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Fri, 16 Oct 2026 23:08:56 +1100 Subject: [PATCH] Add the bne dmz vpc and move the mta2 edge to bne (#559) BinaryLane mel has no stock, so the second mail edge site moves to Brisbane (VPC 172.18.32.0/24); syd and mel stay. - add 172.18.32.0/24 as region bne1 dmz in subnet facts - rename the mta2 edge node hiera to aubne1nxvm2132 Reviewed-on: https://git.unkin.net/unkin/puppet-prod/pulls/559 Co-authored-by: unkin-agent Co-committed-by: unkin-agent --- ....main.unkin.net.yaml => aubne1nxvm2132.main.unkin.net.yaml} | 0 modules/libs/lib/facter/subnet_facts.rb | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename hieradata/nodes/{aumel1nxvm2132.main.unkin.net.yaml => aubne1nxvm2132.main.unkin.net.yaml} (100%) diff --git a/hieradata/nodes/aumel1nxvm2132.main.unkin.net.yaml b/hieradata/nodes/aubne1nxvm2132.main.unkin.net.yaml similarity index 100% rename from hieradata/nodes/aumel1nxvm2132.main.unkin.net.yaml rename to hieradata/nodes/aubne1nxvm2132.main.unkin.net.yaml diff --git a/modules/libs/lib/facter/subnet_facts.rb b/modules/libs/lib/facter/subnet_facts.rb index 532dba3..6fc72ea 100644 --- a/modules/libs/lib/facter/subnet_facts.rb +++ b/modules/libs/lib/facter/subnet_facts.rb @@ -24,7 +24,8 @@ class SubnetAttributes '198.18.28.0/24' => { environment: 'prod', region: 'syd1', country: 'au', zone: 'common' }, # common node0012 '198.18.29.0/24' => { environment: 'prod', region: 'syd1', country: 'au', zone: 'common' }, # common node0013 '172.18.30.0/24' => { environment: 'prod', region: 'syd2', country: 'au', zone: 'dmz' }, # binarylane syd dmz vpc - '172.18.31.0/24' => { environment: 'prod', region: 'mel1', country: 'au', zone: 'dmz' } # binarylane mel dmz vpc + '172.18.31.0/24' => { environment: 'prod', region: 'mel1', country: 'au', zone: 'dmz' }, # binarylane mel dmz vpc + '172.18.32.0/24' => { environment: 'prod', region: 'bne1', country: 'au', zone: 'dmz' } # binarylane bne dmz vpc }.freeze # Default attributes if no subnet matches, also defined as a constant