diff --git a/hieradata/node/perfsonar1.cp.lsst.org.yaml b/hieradata/node/perfsonar1.cp.lsst.org.yaml index 003ce8a271..2a6a867ab4 100644 --- a/hieradata/node/perfsonar1.cp.lsst.org.yaml +++ b/hieradata/node/perfsonar1.cp.lsst.org.yaml @@ -30,22 +30,14 @@ nm::connections: gateway: "139.229.140.12" method: "manual" never-default: "true" - route1: "198.17.196.0/24,139.229.140.12" - route2: "198.32.252.39/32,139.229.140.12" - route3: "198.32.252.192/31,139.229.140.12" - route4: "198.32.252.208/31,139.229.140.12" - route5: "198.32.252.210/31,139.229.140.12" - route6: "198.32.252.216/31,139.229.140.12" - route7: "198.32.252.218/31,139.229.140.12" - route8: "198.32.252.232/31,139.229.140.12" - route9: "198.32.252.234/31,139.229.140.12" - route10: "199.36.153.8/30,139.229.140.12" - route11: "134.79.235.226/32,139.229.140.12" - route12: "134.79.235.242/32,139.229.140.12" - route13: "198.124.226.194/32,139.229.140.12" - route14: "198.124.226.198/32,139.229.140.12" - route15: "198.124.226.202/32,139.229.140.12" - route16: "198.124.226.206/32,139.229.140.12" + route1: "139.229.140.135/32,139.229.140.12" + route2: "198.32.252.209/32,139.229.140.12" + route3: "198.124.226.130/32,139.229.140.12" + route4: "198.124.226.134/32,139.229.140.12" + route5: "198.124.226.138/32,139.229.140.12" + route6: "198.124.226.142/32,139.229.140.12" + route7: "134.79.235.226/32,139.229.140.12" + route8: "134.79.22.159/32,139.229.140.12" ipv6: method: "disabled" proxy: {} @@ -63,16 +55,14 @@ nm::connections: gateway: "139.229.140.14" method: "manual" never-default: "true" - route1: "134.79.235.226/32,139.229.140.14" - route2: "198.17.196.0/24,139.229.140.14" - route3: "198.32.252.194/31,139.229.140.14" - route4: "199.36.153.8/30,139.229.140.14" - route5: "134.79.235.226/32,139.229.140.14" - route6: "134.79.235.242/32,139.229.140.14" - route7: "198.124.226.130/32,139.229.140.14" - route8: "198.124.226.134/32,139.229.140.14" - route9: "198.124.226.138/32,139.229.140.14" - route10: "198.124.226.142/32,139.229.140.14" + route1: "139.229.140.137/32,139.229.140.14" + route2: "198.32.252.217/32,139.229.140.14" + route3: "198.124.226.194/32,139.229.140.14" + route4: "198.124.226.198/32,139.229.140.14" + route5: "198.124.226.202/32,139.229.140.14" + route6: "198.124.226.206/32,139.229.140.14" + route7: "134.79.235.242/32,139.229.140.14" + route8: "134.79.22.212/32,139.229.140.14" ipv6: method: "disabled" proxy: {} @@ -111,7 +101,7 @@ nm::connections: gateway: "139.229.140.10" method: "manual" never-default: "true" - route1: "172.24.7.0/24,139.229.140.10" + route1: "10.101.102.14/32,139.229.140.10" ipv6: method: "disabled" proxy: {} diff --git a/spec/hosts/nodes/perfsonar1.cp.lsst.org_spec.rb b/spec/hosts/nodes/perfsonar1.cp.lsst.org_spec.rb index 5890c7decb..aeb65b4843 100644 --- a/spec/hosts/nodes/perfsonar1.cp.lsst.org_spec.rb +++ b/spec/hosts/nodes/perfsonar1.cp.lsst.org_spec.rb @@ -49,22 +49,14 @@ it { expect(nm_keyfile['ipv4']['address1']).to eq('139.229.140.13/31') } it { expect(nm_keyfile['ipv4']['gateway']).to eq('139.229.140.12') } it { expect(nm_keyfile['ethernet']['mtu']).to eq(9000) } - it { expect(nm_keyfile['ipv4']['route1']).to eq('198.17.196.0/24,139.229.140.12') } - it { expect(nm_keyfile['ipv4']['route2']).to eq('198.32.252.39/32,139.229.140.12') } - it { expect(nm_keyfile['ipv4']['route3']).to eq('198.32.252.192/31,139.229.140.12') } - it { expect(nm_keyfile['ipv4']['route4']).to eq('198.32.252.208/31,139.229.140.12') } - it { expect(nm_keyfile['ipv4']['route5']).to eq('198.32.252.210/31,139.229.140.12') } - it { expect(nm_keyfile['ipv4']['route6']).to eq('198.32.252.216/31,139.229.140.12') } - it { expect(nm_keyfile['ipv4']['route7']).to eq('198.32.252.218/31,139.229.140.12') } - it { expect(nm_keyfile['ipv4']['route8']).to eq('198.32.252.232/31,139.229.140.12') } - it { expect(nm_keyfile['ipv4']['route9']).to eq('198.32.252.234/31,139.229.140.12') } - it { expect(nm_keyfile['ipv4']['route10']).to eq('199.36.153.8/30,139.229.140.12') } - it { expect(nm_keyfile['ipv4']['route11']).to eq('134.79.235.226/32,139.229.140.12') } - it { expect(nm_keyfile['ipv4']['route12']).to eq('134.79.235.242/32,139.229.140.12') } - it { expect(nm_keyfile['ipv4']['route13']).to eq('198.124.226.194/32,139.229.140.12') } - it { expect(nm_keyfile['ipv4']['route14']).to eq('198.124.226.198/32,139.229.140.12') } - it { expect(nm_keyfile['ipv4']['route15']).to eq('198.124.226.202/32,139.229.140.12') } - it { expect(nm_keyfile['ipv4']['route16']).to eq('198.124.226.206/32,139.229.140.12') } + it { expect(nm_keyfile['ipv4']['route1']).to eq('139.229.140.135/32,139.229.140.12') } + it { expect(nm_keyfile['ipv4']['route2']).to eq('198.32.252.209/32,139.229.140.12') } + it { expect(nm_keyfile['ipv4']['route3']).to eq('198.124.226.130/32,139.229.140.12') } + it { expect(nm_keyfile['ipv4']['route4']).to eq('198.124.226.134/32,139.229.140.12') } + it { expect(nm_keyfile['ipv4']['route5']).to eq('198.124.226.138/32,139.229.140.12') } + it { expect(nm_keyfile['ipv4']['route6']).to eq('198.124.226.142/32,139.229.140.12') } + it { expect(nm_keyfile['ipv4']['route7']).to eq('134.79.235.226/32,139.229.140.12') } + it { expect(nm_keyfile['ipv4']['route8']).to eq('134.79.22.159/32,139.229.140.12') } end context 'with enp1s0f1' do @@ -76,16 +68,14 @@ it { expect(nm_keyfile['ipv4']['address1']).to eq('139.229.140.15/31') } it { expect(nm_keyfile['ipv4']['gateway']).to eq('139.229.140.14') } it { expect(nm_keyfile['ethernet']['mtu']).to eq(9000) } - it { expect(nm_keyfile['ipv4']['route1']).to eq('134.79.235.226/32,139.229.140.14') } - it { expect(nm_keyfile['ipv4']['route2']).to eq('198.17.196.0/24,139.229.140.14') } - it { expect(nm_keyfile['ipv4']['route3']).to eq('198.32.252.194/31,139.229.140.14') } - it { expect(nm_keyfile['ipv4']['route4']).to eq('199.36.153.8/30,139.229.140.14') } - it { expect(nm_keyfile['ipv4']['route5']).to eq('134.79.235.226/32,139.229.140.14') } - it { expect(nm_keyfile['ipv4']['route6']).to eq('134.79.235.242/32,139.229.140.14') } - it { expect(nm_keyfile['ipv4']['route7']).to eq('198.124.226.130/32,139.229.140.14') } - it { expect(nm_keyfile['ipv4']['route8']).to eq('198.124.226.134/32,139.229.140.14') } - it { expect(nm_keyfile['ipv4']['route9']).to eq('198.124.226.138/32,139.229.140.14') } - it { expect(nm_keyfile['ipv4']['route10']).to eq('198.124.226.142/32,139.229.140.14') } + it { expect(nm_keyfile['ipv4']['route1']).to eq('139.229.140.137/32,139.229.140.14') } + it { expect(nm_keyfile['ipv4']['route2']).to eq('198.32.252.217/32,139.229.140.14') } + it { expect(nm_keyfile['ipv4']['route3']).to eq('198.124.226.194/32,139.229.140.14') } + it { expect(nm_keyfile['ipv4']['route4']).to eq('198.124.226.198/32,139.229.140.14') } + it { expect(nm_keyfile['ipv4']['route5']).to eq('198.124.226.202/32,139.229.140.14') } + it { expect(nm_keyfile['ipv4']['route6']).to eq('198.124.226.206/32,139.229.140.14') } + it { expect(nm_keyfile['ipv4']['route7']).to eq('134.79.235.242/32,139.229.140.14') } + it { expect(nm_keyfile['ipv4']['route8']).to eq('134.79.22.212/32,139.229.140.14') } end context 'with enp129s0f0np0' do @@ -111,7 +101,7 @@ it { expect(nm_keyfile['ipv4']['address1']).to eq('139.229.140.11/31') } it { expect(nm_keyfile['ipv4']['gateway']).to eq('139.229.140.10') } it { expect(nm_keyfile['ethernet']['mtu']).to eq(9000) } - it { expect(nm_keyfile['ipv4']['route1']).to eq('172.24.7.0/24,139.229.140.10') } + it { expect(nm_keyfile['ipv4']['route1']).to eq('10.101.102.14/32,139.229.140.10') } it { expect(nm_keyfile['ethtool']['ring-rx']).to eq(8192) } it { expect(nm_keyfile['ethtool']['ring-tx']).to eq(8192) } end