From b338c8420a30d54af6a1c7002ae0b1bda6461e7b Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Fri, 16 Oct 2026 21:53:13 +1100 Subject: [PATCH] Move mail DMZ VPC subnet facts to RFC 1918 ranges (#558) BinaryLane only accepts RFC 1918 VPC ranges, so the syd and mel mail DMZ VPCs move from 198.18.30.0/24 and 198.18.31.0/24 to 172.18.30.0/24 and 172.18.31.0/24. - map 172.18.30.0/24 to syd2 dmz and 172.18.31.0/24 to mel1 dmz, replacing the 198.18.30-31 entries Reviewed-on: https://git.unkin.net/unkin/puppet-prod/pulls/558 Co-authored-by: unkin-agent Co-committed-by: unkin-agent --- modules/libs/lib/facter/subnet_facts.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/libs/lib/facter/subnet_facts.rb b/modules/libs/lib/facter/subnet_facts.rb index 8669fe1..532dba3 100644 --- a/modules/libs/lib/facter/subnet_facts.rb +++ b/modules/libs/lib/facter/subnet_facts.rb @@ -23,8 +23,8 @@ class SubnetAttributes '198.18.27.0/24' => { environment: 'prod', region: 'syd1', country: 'au', zone: 'common' }, # common node0011 '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 - '198.18.30.0/24' => { environment: 'prod', region: 'syd2', country: 'au', zone: 'dmz' }, # binarylane syd dmz vpc - '198.18.31.0/24' => { environment: 'prod', region: 'mel1', country: 'au', zone: 'dmz' } # binarylane mel dmz vpc + '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 }.freeze # Default attributes if no subnet matches, also defined as a constant