network: Remove network interface on deprecated VLAN210 network (!341) · Merge requests · Platform / Infrastructure / Puppet / puppet-swh-site

Vincent Sellier requested to merge generated-differential-D5479-source into generated-differential-D5479-target Apr 09, 2021

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

Migrated from D5479 (view on Phabricator)

Admin message

network: Remove network interface on deprecated VLAN210 network

Test Plan

Merge request reports