diff --git a/hieradata/cluster/pillan.yaml b/hieradata/cluster/pillan.yaml index b66ad05f71..c6cfe1afe5 100644 --- a/hieradata/cluster/pillan.yaml +++ b/hieradata/cluster/pillan.yaml @@ -154,11 +154,6 @@ nm::connections: stp: "false" ipv4: method: "disabled" - route1: "140.252.147.192/27" - route1_options: "table=3035" - route2: "0.0.0.0/0,140.252.147.193" - route2_options: "table=3035" - routing-rule1: "priority 100 from 140.252.147.192/27 table 3035" ipv6: method: "disabled" proxy: {} diff --git a/spec/hosts/nodes/pillan01.tu.lsst.org_spec.rb b/spec/hosts/nodes/pillan01.tu.lsst.org_spec.rb index 17964d1f23..e649cc20a7 100644 --- a/spec/hosts/nodes/pillan01.tu.lsst.org_spec.rb +++ b/spec/hosts/nodes/pillan01.tu.lsst.org_spec.rb @@ -143,11 +143,6 @@ it_behaves_like 'nm enabled interface' it_behaves_like 'nm no-ip interface' it_behaves_like 'nm bridge interface' - it { expect(nm_keyfile['ipv4']['route1']).to eq('140.252.147.192/27') } - it { expect(nm_keyfile['ipv4']['route1_options']).to eq("table=#{vlan}") } - it { expect(nm_keyfile['ipv4']['route2']).to eq('0.0.0.0/0,140.252.147.193') } - it { expect(nm_keyfile['ipv4']['route2_options']).to eq("table=#{vlan}") } - it { expect(nm_keyfile['ipv4']['routing-rule1']).to eq("priority 100 from 140.252.147.192/27 table #{vlan}") } end end # on os end # on_supported_os diff --git a/spec/hosts/nodes/pillan08.tu.lsst.org_spec.rb b/spec/hosts/nodes/pillan08.tu.lsst.org_spec.rb index f0e63429dc..5ff572cdde 100644 --- a/spec/hosts/nodes/pillan08.tu.lsst.org_spec.rb +++ b/spec/hosts/nodes/pillan08.tu.lsst.org_spec.rb @@ -147,11 +147,6 @@ it_behaves_like 'nm enabled interface' it_behaves_like 'nm no-ip interface' it_behaves_like 'nm bridge interface' - it { expect(nm_keyfile['ipv4']['route1']).to eq('140.252.147.192/27') } - it { expect(nm_keyfile['ipv4']['route1_options']).to eq("table=#{vlan}") } - it { expect(nm_keyfile['ipv4']['route2']).to eq('0.0.0.0/0,140.252.147.193') } - it { expect(nm_keyfile['ipv4']['route2_options']).to eq("table=#{vlan}") } - it { expect(nm_keyfile['ipv4']['routing-rule1']).to eq("priority 100 from 140.252.147.192/27 table #{vlan}") } end end # on os end # on_supported_os