Skip to content

Commit d1205d7

Browse files
julioconstanzojulioconstanzo
committed
(node/perfsonar.cp) update perfsonar routes
1 parent 93cbe11 commit d1205d7

File tree

2 files changed

+34
-54
lines changed

2 files changed

+34
-54
lines changed

‎hieradata/node/perfsonar1.cp.lsst.org.yaml‎

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,14 @@ nm::connections:
3030
gateway: "139.229.140.12"
3131
method: "manual"
3232
never-default: "true"
33-
route1: "198.17.196.0/24,139.229.140.12"
34-
route2: "198.32.252.39/32,139.229.140.12"
35-
route3: "198.32.252.192/31,139.229.140.12"
36-
route4: "198.32.252.208/31,139.229.140.12"
37-
route5: "198.32.252.210/31,139.229.140.12"
38-
route6: "198.32.252.216/31,139.229.140.12"
39-
route7: "198.32.252.218/31,139.229.140.12"
40-
route8: "198.32.252.232/31,139.229.140.12"
41-
route9: "198.32.252.234/31,139.229.140.12"
42-
route10: "199.36.153.8/30,139.229.140.12"
43-
route11: "134.79.235.226/32,139.229.140.12"
44-
route12: "134.79.235.242/32,139.229.140.12"
45-
route13: "198.124.226.194/32,139.229.140.12"
46-
route14: "198.124.226.198/32,139.229.140.12"
47-
route15: "198.124.226.202/32,139.229.140.12"
48-
route16: "198.124.226.206/32,139.229.140.12"
33+
route1: "139.229.140.135/32,139.229.140.12"
34+
route2: "198.32.252.209/32,139.229.140.12"
35+
route3: "198.124.226.130/32,139.229.140.12"
36+
route4: "198.124.226.134/32,139.229.140.12"
37+
route5: "198.124.226.138/32,139.229.140.12"
38+
route6: "198.124.226.142/32,139.229.140.12"
39+
route7: "134.79.235.226/32,139.229.140.12"
40+
route8: "134.79.22.159/32,139.229.140.12"
4941
ipv6:
5042
method: "disabled"
5143
proxy: {}
@@ -63,16 +55,14 @@ nm::connections:
6355
gateway: "139.229.140.14"
6456
method: "manual"
6557
never-default: "true"
66-
route1: "134.79.235.226/32,139.229.140.14"
67-
route2: "198.17.196.0/24,139.229.140.14"
68-
route3: "198.32.252.194/31,139.229.140.14"
69-
route4: "199.36.153.8/30,139.229.140.14"
70-
route5: "134.79.235.226/32,139.229.140.14"
71-
route6: "134.79.235.242/32,139.229.140.14"
72-
route7: "198.124.226.130/32,139.229.140.14"
73-
route8: "198.124.226.134/32,139.229.140.14"
74-
route9: "198.124.226.138/32,139.229.140.14"
75-
route10: "198.124.226.142/32,139.229.140.14"
58+
route1: "139.229.140.137/32,139.229.140.14"
59+
route2: "198.32.252.217/32,139.229.140.14"
60+
route3: "198.124.226.194/32,139.229.140.14"
61+
route4: "198.124.226.198/32,139.229.140.14"
62+
route5: "198.124.226.202/32,139.229.140.14"
63+
route6: "198.124.226.206/32,139.229.140.14"
64+
route7: "134.79.235.242/32,139.229.140.14"
65+
route8: "134.79.22.212/32,139.229.140.14"
7666
ipv6:
7767
method: "disabled"
7868
proxy: {}
@@ -111,7 +101,7 @@ nm::connections:
111101
gateway: "139.229.140.10"
112102
method: "manual"
113103
never-default: "true"
114-
route1: "172.24.7.0/24,139.229.140.10"
104+
route1: "10.101.102.14/32,139.229.140.10"
115105
ipv6:
116106
method: "disabled"
117107
proxy: {}

‎spec/hosts/nodes/perfsonar1.cp.lsst.org_spec.rb‎

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,14 @@
4949
it { expect(nm_keyfile['ipv4']['address1']).to eq('139.229.140.13/31') }
5050
it { expect(nm_keyfile['ipv4']['gateway']).to eq('139.229.140.12') }
5151
it { expect(nm_keyfile['ethernet']['mtu']).to eq(9000) }
52-
it { expect(nm_keyfile['ipv4']['route1']).to eq('198.17.196.0/24,139.229.140.12') }
53-
it { expect(nm_keyfile['ipv4']['route2']).to eq('198.32.252.39/32,139.229.140.12') }
54-
it { expect(nm_keyfile['ipv4']['route3']).to eq('198.32.252.192/31,139.229.140.12') }
55-
it { expect(nm_keyfile['ipv4']['route4']).to eq('198.32.252.208/31,139.229.140.12') }
56-
it { expect(nm_keyfile['ipv4']['route5']).to eq('198.32.252.210/31,139.229.140.12') }
57-
it { expect(nm_keyfile['ipv4']['route6']).to eq('198.32.252.216/31,139.229.140.12') }
58-
it { expect(nm_keyfile['ipv4']['route7']).to eq('198.32.252.218/31,139.229.140.12') }
59-
it { expect(nm_keyfile['ipv4']['route8']).to eq('198.32.252.232/31,139.229.140.12') }
60-
it { expect(nm_keyfile['ipv4']['route9']).to eq('198.32.252.234/31,139.229.140.12') }
61-
it { expect(nm_keyfile['ipv4']['route10']).to eq('199.36.153.8/30,139.229.140.12') }
62-
it { expect(nm_keyfile['ipv4']['route11']).to eq('134.79.235.226/32,139.229.140.12') }
63-
it { expect(nm_keyfile['ipv4']['route12']).to eq('134.79.235.242/32,139.229.140.12') }
64-
it { expect(nm_keyfile['ipv4']['route13']).to eq('198.124.226.194/32,139.229.140.12') }
65-
it { expect(nm_keyfile['ipv4']['route14']).to eq('198.124.226.198/32,139.229.140.12') }
66-
it { expect(nm_keyfile['ipv4']['route15']).to eq('198.124.226.202/32,139.229.140.12') }
67-
it { expect(nm_keyfile['ipv4']['route16']).to eq('198.124.226.206/32,139.229.140.12') }
52+
it { expect(nm_keyfile['ipv4']['route1']).to eq('139.229.140.135/32,139.229.140.12') }
53+
it { expect(nm_keyfile['ipv4']['route2']).to eq('198.32.252.209/32,139.229.140.12') }
54+
it { expect(nm_keyfile['ipv4']['route3']).to eq('198.124.226.130/32,139.229.140.12') }
55+
it { expect(nm_keyfile['ipv4']['route4']).to eq('198.124.226.134/32,139.229.140.12') }
56+
it { expect(nm_keyfile['ipv4']['route5']).to eq('198.124.226.138/32,139.229.140.12') }
57+
it { expect(nm_keyfile['ipv4']['route6']).to eq('198.124.226.142/32,139.229.140.12') }
58+
it { expect(nm_keyfile['ipv4']['route7']).to eq('134.79.235.226/32,139.229.140.12') }
59+
it { expect(nm_keyfile['ipv4']['route8']).to eq('134.79.22.159/32,139.229.140.12') }
6860
end
6961

7062
context 'with enp1s0f1' do
@@ -76,16 +68,14 @@
7668
it { expect(nm_keyfile['ipv4']['address1']).to eq('139.229.140.15/31') }
7769
it { expect(nm_keyfile['ipv4']['gateway']).to eq('139.229.140.14') }
7870
it { expect(nm_keyfile['ethernet']['mtu']).to eq(9000) }
79-
it { expect(nm_keyfile['ipv4']['route1']).to eq('134.79.235.226/32,139.229.140.14') }
80-
it { expect(nm_keyfile['ipv4']['route2']).to eq('198.17.196.0/24,139.229.140.14') }
81-
it { expect(nm_keyfile['ipv4']['route3']).to eq('198.32.252.194/31,139.229.140.14') }
82-
it { expect(nm_keyfile['ipv4']['route4']).to eq('199.36.153.8/30,139.229.140.14') }
83-
it { expect(nm_keyfile['ipv4']['route5']).to eq('134.79.235.226/32,139.229.140.14') }
84-
it { expect(nm_keyfile['ipv4']['route6']).to eq('134.79.235.242/32,139.229.140.14') }
85-
it { expect(nm_keyfile['ipv4']['route7']).to eq('198.124.226.130/32,139.229.140.14') }
86-
it { expect(nm_keyfile['ipv4']['route8']).to eq('198.124.226.134/32,139.229.140.14') }
87-
it { expect(nm_keyfile['ipv4']['route9']).to eq('198.124.226.138/32,139.229.140.14') }
88-
it { expect(nm_keyfile['ipv4']['route10']).to eq('198.124.226.142/32,139.229.140.14') }
71+
it { expect(nm_keyfile['ipv4']['route1']).to eq('139.229.140.137/32,139.229.140.14') }
72+
it { expect(nm_keyfile['ipv4']['route2']).to eq('198.32.252.217/32,139.229.140.14') }
73+
it { expect(nm_keyfile['ipv4']['route3']).to eq('198.124.226.194/32,139.229.140.14') }
74+
it { expect(nm_keyfile['ipv4']['route4']).to eq('198.124.226.198/32,139.229.140.14') }
75+
it { expect(nm_keyfile['ipv4']['route5']).to eq('198.124.226.202/32,139.229.140.14') }
76+
it { expect(nm_keyfile['ipv4']['route6']).to eq('198.124.226.206/32,139.229.140.14') }
77+
it { expect(nm_keyfile['ipv4']['route7']).to eq('134.79.235.242/32,139.229.140.14') }
78+
it { expect(nm_keyfile['ipv4']['route8']).to eq('134.79.22.212/32,139.229.140.14') }
8979
end
9080

9181
context 'with enp129s0f0np0' do
@@ -111,7 +101,7 @@
111101
it { expect(nm_keyfile['ipv4']['address1']).to eq('139.229.140.11/31') }
112102
it { expect(nm_keyfile['ipv4']['gateway']).to eq('139.229.140.10') }
113103
it { expect(nm_keyfile['ethernet']['mtu']).to eq(9000) }
114-
it { expect(nm_keyfile['ipv4']['route1']).to eq('172.24.7.0/24,139.229.140.10') }
104+
it { expect(nm_keyfile['ipv4']['route1']).to eq('10.101.102.14/32,139.229.140.10') }
115105
it { expect(nm_keyfile['ethtool']['ring-rx']).to eq(8192) }
116106
it { expect(nm_keyfile['ethtool']['ring-tx']).to eq(8192) }
117107
end

0 commit comments

Comments
 (0)