Page MenuHomeSoftware Heritage
Differential D5479

network: Remove network interface on deprecated VLAN210 network
ClosedPublic
Actions

Authored by vsellier on Apr 9 2021, 3:14 PM.

Details

Reviewers
olasd
Group Reviewers
System administrators
Maniphest Tasks
T3228: Free 4 of 5 remaining ips still used on vlan210
Commits
rSPSITE657bfb390b33: network: Remove network interface on deprecated VLAN210 network
Summary

and configure the eth0 interface with the vlan1300 configuration
The proxmox configuration will need to be adapted accordingly
before applying the changes and the server restarted to ensure
everything is ok after a reboot

Related to T3228

Test Plan
  • pergamon
diff origin/production/pergamon.softwareheritage.org current/pergamon.softwareheritage.org
*******************************************
  Concat::Fragment[eth0_stanza] =>
   parameters =>
     content =>
      @@ -2,13 +2,6 @@
       auto eth0
       iface eth0 inet static
      -  address 128.93.193.29
      -  netmask 255.255.255.0
      -  up ip rule add from 128.93.193.29 table vlan220
      -  up ip route add 128.93.193.0/24 src 128.93.193.29 dev $IFACE table vlan220
      -  up ip route add default via 128.93.193.254 dev $IFACE table vlan220
      -  up ip route flush cache
      -  down ip route del default via 128.93.193.254 dev $IFACE table vlan220
      -  down ip route del 128.93.193.0/24 src 128.93.193.29 dev $IFACE table vlan220
      -  down ip rule del from 128.93.193.29 table vlan220
      -  down ip route flush cache
      +  address 128.93.166.14
      +  netmask 26
      +  gateway 128.93.166.62
      _
*******************************************
- Concat::Fragment[eth2_stanza]
*******************************************
  Concat_fragment[eth0_stanza] =>
   parameters =>
     content =>
      @@ -2,13 +2,6 @@
       auto eth0
       iface eth0 inet static
      -  address 128.93.193.29
      -  netmask 255.255.255.0
      -  up ip rule add from 128.93.193.29 table vlan220
      -  up ip route add 128.93.193.0/24 src 128.93.193.29 dev $IFACE table vlan220
      -  up ip route add default via 128.93.193.254 dev $IFACE table vlan220
      -  up ip route flush cache
      -  down ip route del default via 128.93.193.254 dev $IFACE table vlan220
      -  down ip route del 128.93.193.0/24 src 128.93.193.29 dev $IFACE table vlan220
      -  down ip rule del from 128.93.193.29 table vlan220
      -  down ip route flush cache
      +  address 128.93.166.14
      +  netmask 26
      +  gateway 128.93.166.62
      _
*******************************************
- Concat_fragment[eth2_stanza]
*******************************************
  Debnet::Iface[eth0] =>
   parameters =>
     address =>
      - 128.93.193.29
      + 128.93.166.14
     downs =>
      - ["ip route del default via 128.93.193.254 dev $IFACE table vlan220", "ip route del 128.93.193.0/24 src 128.93.193.29 dev $IFACE table vlan220", "ip rule del from 128.93.193.29 table vlan220", "ip route flush cache"]
      + []
     gateway =>
      + 128.93.166.62
     netmask =>
      - 255.255.255.0
      + 26
     ups =>
      - ["ip rule add from 128.93.193.29 table vlan220", "ip route add 128.93.193.0/24 src 128.93.193.29 dev $IFACE table vlan220", "ip route add default via 128.93.193.254 dev $IFACE table vlan220", "ip route flush cache"]
      + []
*******************************************
- Debnet::Iface[eth2]
*******************************************
*** End octocatalog-diff on pergamon.softwareheritage.org
  • Moma:
diff origin/production/moma.softwareheritage.org current/moma.softwareheritage.org
*******************************************
  Concat::Fragment[eth0_stanza] =>
   parameters =>
     content =>
      @@ -2,13 +2,6 @@
       auto eth0
       iface eth0 inet static
      -  address 128.93.193.31
      -  netmask 255.255.255.0
      -  up ip rule add from 128.93.193.31 table vlan220
      -  up ip route add 128.93.193.0/24 src 128.93.193.31 dev $IFACE table vlan220
      -  up ip route add default via 128.93.193.254 dev $IFACE table vlan220
      -  up ip route flush cache
      -  down ip route del default via 128.93.193.254 dev $IFACE table vlan220
      -  down ip route del 128.93.193.0/24 src 128.93.193.31 dev $IFACE table vlan220
      -  down ip rule del from 128.93.193.31 table vlan220
      -  down ip route flush cache
      +  address 128.93.166.15
      +  netmask 26
      +  gateway 128.93.166.62
      _
*******************************************
- Concat::Fragment[eth2_stanza]
*******************************************
  Concat_fragment[eth0_stanza] =>
   parameters =>
     content =>
      @@ -2,13 +2,6 @@
       auto eth0
       iface eth0 inet static
      -  address 128.93.193.31
      -  netmask 255.255.255.0
      -  up ip rule add from 128.93.193.31 table vlan220
      -  up ip route add 128.93.193.0/24 src 128.93.193.31 dev $IFACE table vlan220
      -  up ip route add default via 128.93.193.254 dev $IFACE table vlan220
      -  up ip route flush cache
      -  down ip route del default via 128.93.193.254 dev $IFACE table vlan220
      -  down ip route del 128.93.193.0/24 src 128.93.193.31 dev $IFACE table vlan220
      -  down ip rule del from 128.93.193.31 table vlan220
      -  down ip route flush cache
      +  address 128.93.166.15
      +  netmask 26
      +  gateway 128.93.166.62
      _
*******************************************
- Concat_fragment[eth2_stanza]
*******************************************
  Debnet::Iface[eth0] =>
   parameters =>
     address =>
      - 128.93.193.31
      + 128.93.166.15
     downs =>
      - ["ip route del default via 128.93.193.254 dev $IFACE table vlan220", "ip route del 128.93.193.0/24 src 128.93.193.31 dev $IFACE table vlan220", "ip rule del from 128.93.193.31 table vlan220", "ip route flush cache"]
      + []
     gateway =>
      + 128.93.166.62
     netmask =>
      - 255.255.255.0
      + 26
     ups =>
      - ["ip rule add from 128.93.193.31 table vlan220", "ip route add 128.93.193.0/24 src 128.93.193.31 dev $IFACE table vlan220", "ip route add default via 128.93.193.254 dev $IFACE table vlan220", "ip route flush cache"]
      + []
*******************************************
- Debnet::Iface[eth2]
*******************************************
  File[/etc/softwareheritage/web/web.yml] =>
   parameters =>
     content =>
      @@ -29,5 +29,5 @@
             - 127.0.0.0/8
             - 192.168.100.0/23
      -      - 128.93.193.29
      +      - 128.93.166.14
             - 131.107.174.0/24
             - 213.135.60.145
      @@ -48,5 +48,5 @@
             - 127.0.0.0/8
             - 192.168.100.0/23
      -      - 128.93.193.29
      +      - 128.93.166.14
             - 131.107.174.0/24
             - 213.135.60.145
      @@ -60,5 +60,5 @@
             - 127.0.0.0/8
             - 192.168.100.0/23
      -      - 128.93.193.29
      +      - 128.93.166.14
             - 131.107.174.0/24
             - 213.135.60.145
*******************************************
*** End octocatalog-diff on moma.softwareheritage.org
  • tate:
diff origin/production/tate.softwareheritage.org current/tate.softwareheritage.org
*******************************************
  Concat::Fragment[eth0_stanza] =>
   parameters =>
     content =>
      @@ -2,13 +2,6 @@
       auto eth0
       iface eth0 inet static
      -  address 128.93.193.30
      -  netmask 255.255.255.0
      -  up ip rule add from 128.93.193.30 table vlan220
      -  up ip route add 128.93.193.0/24 src 128.93.193.30 dev $IFACE table vlan220
      -  up ip route add default via 128.93.193.254 dev $IFACE table vlan220
      -  up ip route flush cache
      -  down ip route del default via 128.93.193.254 dev $IFACE table vlan220
      -  down ip route del 128.93.193.0/24 src 128.93.193.30 dev $IFACE table vlan220
      -  down ip rule del from 128.93.193.30 table vlan220
      -  down ip route flush cache
      +  address 128.93.166.12
      +  netmask 26
      +  gateway 128.93.166.62
      _
*******************************************
- Concat::Fragment[eth2_stanza]
*******************************************
  Concat_fragment[eth0_stanza] =>
   parameters =>
     content =>
      @@ -2,13 +2,6 @@
       auto eth0
       iface eth0 inet static
      -  address 128.93.193.30
      -  netmask 255.255.255.0
      -  up ip rule add from 128.93.193.30 table vlan220
      -  up ip route add 128.93.193.0/24 src 128.93.193.30 dev $IFACE table vlan220
      -  up ip route add default via 128.93.193.254 dev $IFACE table vlan220
      -  up ip route flush cache
      -  down ip route del default via 128.93.193.254 dev $IFACE table vlan220
      -  down ip route del 128.93.193.0/24 src 128.93.193.30 dev $IFACE table vlan220
      -  down ip rule del from 128.93.193.30 table vlan220
      -  down ip route flush cache
      +  address 128.93.166.12
      +  netmask 26
      +  gateway 128.93.166.62
      _
*******************************************
- Concat_fragment[eth2_stanza]
*******************************************
  Debnet::Iface[eth0] =>
   parameters =>
     address =>
      - 128.93.193.30
      + 128.93.166.12
     downs =>
      - ["ip route del default via 128.93.193.254 dev $IFACE table vlan220", "ip route del 128.93.193.0/24 src 128.93.193.30 dev $IFACE table vlan220", "ip rule del from 128.93.193.30 table vlan220", "ip route flush cache"]
      + []
     gateway =>
      + 128.93.166.62
     netmask =>
      - 255.255.255.0
      + 26
     ups =>
      - ["ip rule add from 128.93.193.30 table vlan220", "ip route add 128.93.193.0/24 src 128.93.193.30 dev $IFACE table vlan220", "ip route add default via 128.93.193.254 dev $IFACE table vlan220", "ip route flush cache"]
      + []
*******************************************
- Debnet::Iface[eth2]
*******************************************
*** End octocatalog-diff on tate.softwareheritage.org

Diff Detail

Repository
rSPSITE puppet-swh-site
Branch
staging
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 20606
Build 31981: arc lint + arc unit

Event Timeline

vsellier requested review of this revision.Apr 9 2021, 3:14 PM
vsellier created this revision.
Harbormaster completed remote builds in B20606: Diff 19573.Apr 9 2021, 3:14 PM
vsellier updated this revision to Diff 19577.Apr 9 2021, 3:34 PM

fix a typo on the commit message

Harbormaster completed remote builds in B20610: Diff 19577.Apr 9 2021, 3:34 PM
vsellier retitled this revision from nerwtork: Remove network interface on deprecated VLAN210 network to network: Remove network interface on deprecated VLAN210 network.Apr 9 2021, 3:34 PM
olasd accepted this revision.Apr 12 2021, 10:14 AM
This revision is now accepted and ready to land.Apr 12 2021, 10:14 AM
vsellier updated this revision to Diff 19619.Apr 12 2021, 5:14 PM

rebase

Harbormaster completed remote builds in B20650: Diff 19619.Apr 12 2021, 5:14 PM
Closed by commit rSPSITE657bfb390b33: network: Remove network interface on deprecated VLAN210 network (authored by vsellier). · Explain WhyApr 12 2021, 5:18 PM
This revision was automatically updated to reflect the committed changes.
vsellier added a commit: rSPSITE657bfb390b33: network: Remove network interface on deprecated VLAN210 network.

Revision Contents
Changeset List

Diff 19573

View Options

data/common/common.yaml

Loading...
View Options

data/hostname/moma.softwareheritage.org.yaml

Loading...
View Options

data/hostname/pergamon.softwareheritage.org.yaml

Loading...
View Options

data/hostname/tate.softwareheritage.org.yaml

Loading...
About · Developer information · Legal