Page MenuHomeSoftware Heritage
Differential D5929

network: clean old gateways and routes
ClosedPublic
Actions

Authored by vsellier on Jun 25 2021, 5:08 PM.

Details

Reviewers
ardumont
Group Reviewers
System administrators
Maniphest Tasks
T1526: Install a new VPN endpoint at Rocquencourt
Commits
rSPSITE144a796abf87: network: clean old gateways and routes
Summary
  • Remove the legacy gateway entries
  • Remove louvre

Related to T1526

Test Plan
  • pergamon
diff origin/production/pergamon.softwareheritage.org current/pergamon.softwareheritage.org
*******************************************
  Concat::Fragment[eth1_stanza] =>
   parameters =>
     content =>
      @@ -5,9 +5,7 @@
         netmask 255.255.255.0
         up ip route add 192.168.101.0/24 via 192.168.100.1
      -  up ip route add 192.168.102.0/23 via 192.168.100.130
         up ip route add 192.168.200.0/21 via 192.168.100.1
      -  up ip route add 192.168.128.0/24 via 192.168.100.125
      -  up ip route add 192.168.130.0/24 via 192.168.100.130
      -  up ip route add 192.168.50.0/24 via 192.168.100.130
      +  up ip route add 192.168.130.0/24 via 192.168.100.1
      +  up ip route add 192.168.50.0/24 via 192.168.100.1
         up ip rule add from 192.168.100.29 table private
         up ip route add 192.168.100.0/24 src 192.168.100.29 dev eth1 table private
      @@ -17,9 +15,7 @@
         down ip route del 192.168.100.0/24 src 192.168.100.29 dev eth1 table private
         down ip rule del from 192.168.100.29 table private
      -  down ip route del 192.168.50.0/24 via 192.168.100.130
      -  down ip route del 192.168.130.0/24 via 192.168.100.130
      -  down ip route del 192.168.128.0/24 via 192.168.100.125
      +  down ip route del 192.168.50.0/24 via 192.168.100.1
      +  down ip route del 192.168.130.0/24 via 192.168.100.1
         down ip route del 192.168.200.0/21 via 192.168.100.1
      -  down ip route del 192.168.102.0/23 via 192.168.100.130
         down ip route del 192.168.101.0/24 via 192.168.100.1
         down ip route flush cache
*******************************************
  Concat_fragment[eth1_stanza] =>
   parameters =>
     content =>
      @@ -5,9 +5,7 @@
         netmask 255.255.255.0
         up ip route add 192.168.101.0/24 via 192.168.100.1
      -  up ip route add 192.168.102.0/23 via 192.168.100.130
         up ip route add 192.168.200.0/21 via 192.168.100.1
      -  up ip route add 192.168.128.0/24 via 192.168.100.125
      -  up ip route add 192.168.130.0/24 via 192.168.100.130
      -  up ip route add 192.168.50.0/24 via 192.168.100.130
      +  up ip route add 192.168.130.0/24 via 192.168.100.1
      +  up ip route add 192.168.50.0/24 via 192.168.100.1
         up ip rule add from 192.168.100.29 table private
         up ip route add 192.168.100.0/24 src 192.168.100.29 dev eth1 table private
      @@ -17,9 +15,7 @@
         down ip route del 192.168.100.0/24 src 192.168.100.29 dev eth1 table private
         down ip rule del from 192.168.100.29 table private
      -  down ip route del 192.168.50.0/24 via 192.168.100.130
      -  down ip route del 192.168.130.0/24 via 192.168.100.130
      -  down ip route del 192.168.128.0/24 via 192.168.100.125
      +  down ip route del 192.168.50.0/24 via 192.168.100.1
      +  down ip route del 192.168.130.0/24 via 192.168.100.1
         down ip route del 192.168.200.0/21 via 192.168.100.1
      -  down ip route del 192.168.102.0/23 via 192.168.100.130
         down ip route del 192.168.101.0/24 via 192.168.100.1
         down ip route flush cache
*******************************************
  Debnet::Iface[eth1] =>
   parameters =>
     downs =>
      - ["ip route del default via 192.168.100.1 dev eth1 table private", "ip route del 192.168.100.0/24 src 192.168.100.29 dev eth1 table private", "ip rule del from 192.168.100.29 table private", "ip route del 192.168.50.0/24 via 192.168.100.130", "ip route del 192.168.130.0/24 via 192.168.100.130", "ip route del 192.168.128.0/24 via 192.168.100.125", "ip route del 192.168.200.0/21 via 192.168.100.1", "ip route del 192.168.102.0/23 via 192.168.100.130", "ip route del 192.168.101.0/24 via 192.168.100.1", "ip route flush cache"]
      + ["ip route del default via 192.168.100.1 dev eth1 table private", "ip route del 192.168.100.0/24 src 192.168.100.29 dev eth1 table private", "ip rule del from 192.168.100.29 table private", "ip route del 192.168.50.0/24 via 192.168.100.1", "ip route del 192.168.130.0/24 via 192.168.100.1", "ip route del 192.168.200.0/21 via 192.168.100.1", "ip route del 192.168.101.0/24 via 192.168.100.1", "ip route flush cache"]
     ups =>
      - ["ip route add 192.168.101.0/24 via 192.168.100.1", "ip route add 192.168.102.0/23 via 192.168.100.130", "ip route add 192.168.200.0/21 via 192.168.100.1", "ip route add 192.168.128.0/24 via 192.168.100.125", "ip route add 192.168.130.0/24 via 192.168.100.130", "ip route add 192.168.50.0/24 via 192.168.100.130", "ip rule add from 192.168.100.29 table private", "ip route add 192.168.100.0/24 src 192.168.100.29 dev eth1 table private", "ip route add default via 192.168.100.1 dev eth1 table private", "ip route flush cache"]
      + ["ip route add 192.168.101.0/24 via 192.168.100.1", "ip route add 192.168.200.0/21 via 192.168.100.1", "ip route add 192.168.130.0/24 via 192.168.100.1", "ip route add 192.168.50.0/24 via 192.168.100.1", "ip rule add from 192.168.100.29 table private", "ip route add 192.168.100.0/24 src 192.168.100.29 dev eth1 table private", "ip route add default via 192.168.100.1 dev eth1 table private", "ip route flush cache"]
*******************************************

  Resource_record[internalgw/A+PTR] =>
   parameters =>
     record =>
      - 130.100.168.192.in-addr.arpa
      + 1.100.168.192.in-addr.arpa
*******************************************
  Resource_record[internalgw/A] =>
   parameters =>
     data =>
      - 192.168.100.130
      + 192.168.100.1
*******************************************
- Resource_record[staging-gateway/A+PTR]
*******************************************
- Resource_record[staging-gateway/A]
*******************************************
*** End octocatalog-diff on pergamon.softwareheritage.org
  • workers:
diff origin/production/worker01.softwareheritage.org current/worker01.softwareheritage.org
*******************************************
  Concat::Fragment[ens19_stanza] =>
   parameters =>
     content =>
      @@ -5,5 +5,4 @@
         netmask 255.255.255.0
         up ip route add 192.168.101.0/24 via 192.168.100.1
      -  up ip route add 192.168.102.0/23 via 192.168.100.130
         up ip route add 192.168.200.0/21 via 192.168.100.1
         up ip rule add from 192.168.100.21 table private
      @@ -15,5 +14,4 @@
         down ip rule del from 192.168.100.21 table private
         down ip route del 192.168.200.0/21 via 192.168.100.1
      -  down ip route del 192.168.102.0/23 via 192.168.100.130
         down ip route del 192.168.101.0/24 via 192.168.100.1
         down ip route flush cache
*******************************************
  Concat_fragment[ens19_stanza] =>
   parameters =>
     content =>
      @@ -5,5 +5,4 @@
         netmask 255.255.255.0
         up ip route add 192.168.101.0/24 via 192.168.100.1
      -  up ip route add 192.168.102.0/23 via 192.168.100.130
         up ip route add 192.168.200.0/21 via 192.168.100.1
         up ip rule add from 192.168.100.21 table private
      @@ -15,5 +14,4 @@
         down ip rule del from 192.168.100.21 table private
         down ip route del 192.168.200.0/21 via 192.168.100.1
      -  down ip route del 192.168.102.0/23 via 192.168.100.130
         down ip route del 192.168.101.0/24 via 192.168.100.1
         down ip route flush cache
*******************************************
  Debnet::Iface[ens19] =>
   parameters =>
     downs =>
      - ["ip route del default via 192.168.100.1 dev ens19 table private", "ip route del 192.168.100.0/24 src 192.168.100.21 dev ens19 table private", "ip rule del from 192.168.100.21 table private", "ip route del 192.168.200.0/21 via 192.168.100.1", "ip route del 192.168.102.0/23 via 192.168.100.130", "ip route del 192.168.101.0/24 via 192.168.100.1", "ip route flush cache"]
      + ["ip route del default via 192.168.100.1 dev ens19 table private", "ip route del 192.168.100.0/24 src 192.168.100.21 dev ens19 table private", "ip rule del from 192.168.100.21 table private", "ip route del 192.168.200.0/21 via 192.168.100.1", "ip route del 192.168.101.0/24 via 192.168.100.1", "ip route flush cache"]
     ups =>
      - ["ip route add 192.168.101.0/24 via 192.168.100.1", "ip route add 192.168.102.0/23 via 192.168.100.130", "ip route add 192.168.200.0/21 via 192.168.100.1", "ip rule add from 192.168.100.21 table private", "ip route add 192.168.100.0/24 src 192.168.100.21 dev ens19 table private", "ip route add default via 192.168.100.1 dev ens19 table private", "ip route flush cache"]
      + ["ip route add 192.168.101.0/24 via 192.168.100.1", "ip route add 192.168.200.0/21 via 192.168.100.1", "ip rule add from 192.168.100.21 table private", "ip route add 192.168.100.0/24 src 192.168.100.21 dev ens19 table private", "ip route add default via 192.168.100.1 dev ens19 table private", "ip route flush cache"]
*******************************************
*** End octocatalog-diff on worker01.softwareheritage.org
  • moma
diff origin/production/moma.softwareheritage.org current/moma.softwareheritage.org
*******************************************
  Concat::Fragment[eth1_stanza] =>
   parameters =>
     content =>
      @@ -5,5 +5,4 @@
         netmask 255.255.255.0
         up ip route add 192.168.101.0/24 via 192.168.100.1
      -  up ip route add 192.168.102.0/23 via 192.168.100.130
         up ip route add 192.168.200.0/21 via 192.168.100.1
         up ip rule add from 192.168.100.31 table private
      @@ -15,5 +14,4 @@
         down ip rule del from 192.168.100.31 table private
         down ip route del 192.168.200.0/21 via 192.168.100.1
      -  down ip route del 192.168.102.0/23 via 192.168.100.130
         down ip route del 192.168.101.0/24 via 192.168.100.1
         down ip route flush cache
*******************************************
  Concat_fragment[eth1_stanza] =>
   parameters =>
     content =>
      @@ -5,5 +5,4 @@
         netmask 255.255.255.0
         up ip route add 192.168.101.0/24 via 192.168.100.1
      -  up ip route add 192.168.102.0/23 via 192.168.100.130
         up ip route add 192.168.200.0/21 via 192.168.100.1
         up ip rule add from 192.168.100.31 table private
      @@ -15,5 +14,4 @@
         down ip rule del from 192.168.100.31 table private
         down ip route del 192.168.200.0/21 via 192.168.100.1
      -  down ip route del 192.168.102.0/23 via 192.168.100.130
         down ip route del 192.168.101.0/24 via 192.168.100.1
         down ip route flush cache
*******************************************
  Debnet::Iface[eth1] =>
   parameters =>
     downs =>
      - ["ip route del default via 192.168.100.1 dev eth1 table private", "ip route del 192.168.100.0/24 src 192.168.100.31 dev eth1 table private", "ip rule del from 192.168.100.31 table private", "ip route del 192.168.200.0/21 via 192.168.100.1", "ip route del 192.168.102.0/23 via 192.168.100.130", "ip route del 192.168.101.0/24 via 192.168.100.1", "ip route flush cache"]
      + ["ip route del default via 192.168.100.1 dev eth1 table private", "ip route del 192.168.100.0/24 src 192.168.100.31 dev eth1 table private", "ip rule del from 192.168.100.31 table private", "ip route del 192.168.200.0/21 via 192.168.100.1", "ip route del 192.168.101.0/24 via 192.168.100.1", "ip route flush cache"]
     ups =>
      - ["ip route add 192.168.101.0/24 via 192.168.100.1", "ip route add 192.168.102.0/23 via 192.168.100.130", "ip route add 192.168.200.0/21 via 192.168.100.1", "ip rule add from 192.168.100.31 table private", "ip route add 192.168.100.0/24 src 192.168.100.31 dev eth1 table private", "ip route add default via 192.168.100.1 dev eth1 table private", "ip route flush cache"]
      + ["ip route add 192.168.101.0/24 via 192.168.100.1", "ip route add 192.168.200.0/21 via 192.168.100.1", "ip rule add from 192.168.100.31 table private", "ip route add 192.168.100.0/24 src 192.168.100.31 dev eth1 table private", "ip route add default via 192.168.100.1 dev eth1 table private", "ip route flush cache"]
*******************************************
*** End octocatalog-diff on moma.softwareheritage.org
  • saam
*** Running octocatalog-diff on host saam.internal.softwareheritage.org
I, [2021-06-25T17:07:31.197613 #17309]  INFO -- : Catalogs compiled for saam.internal.softwareheritage.org
I, [2021-06-25T17:07:32.459262 #17309]  INFO -- : Diffs computed for saam.internal.softwareheritage.org
I, [2021-06-25T17:07:32.459294 #17309]  INFO -- : No differences
*** End octocatalog-diff on saam.internal.softwareheritage.org

Diff Detail

Repository
rSPSITE puppet-swh-site
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathSize
data/
common/
27 lines
hostname/
2 lines
manifests/
4 lines

Diff 21356

View Options

data/common/common.yaml

Loading...
View Options

data/hostname/pergamon.softwareheritage.org.yaml

Loading...
View Options

manifests/site.pp

Loading...
About · Developer information · Legal