Decomission webapp0 node (!291) · Merge requests · Platform / Infrastructure / Puppet / puppet-swh-site

Antoine R. Dumont requested to merge generated-differential-D4802-source into generated-differential-D4802-target Jan 04, 2021

Related to T2919

Test Plan

bin/octocatalog on webapp0 (wants to remove plenty of services as it fallbacks to the default behavior for that node):

...
- Profile::Varnish::Vhost[webapp0.softwareheritage.org]
*******************************************
- Service[filebeat]
*******************************************
- Service[gunicorn-swh-webapp]
*******************************************
- Service[gunicorn]
*******************************************
- Service[hitch]
*******************************************
- Service[httpd]
*******************************************
- Service[memcached]
*******************************************
- Service[varnish]
*******************************************
- Systemd::Tmpfile[gunicorn-swh-webapp.conf]
*******************************************
- Systemd::Tmpfile[gunicorn.conf]
*******************************************
- Systemd::Unit_file[gunicorn-swh-webapp.service]
*******************************************
- Systemd::Unit_file[gunicorn.service]
*******************************************
- User[www-data]
*******************************************
- Varnish::Vcl[/etc/varnish/default.vcl]
*******************************************
- Varnish::Vcl[/etc/varnish/includes/01_webapp.vcl]
*******************************************
- Varnish::Vcl[/etc/varnish/includes/10_synth_redirect.vcl]
*******************************************
- Varnish::Vcl[/etc/varnish/includes/50_vhost_webapp0.softwareheritage.org.vcl]

keycloak is slightly impacted because we remove the webapp0 reference:

  Keycloak_client[swh-web on SoftwareHeritage] =>
   parameters =>
     redirect_uris =>
      - ["https://archive.softwareheritage.org/*", "https://base.softwareheritage.org/*", "https://archive.internal.softwareheritage.org/*", "https://webapp0.softwareheritage.org/*"]
      + ["https://archive.softwareheritage.org/*", "https://base.softwareheritage.org/*", "https://archive.internal.softwareheritage.org/*"]
*******************************************
*** End octocatalog-diff on kelvingrove.internal.softwareheritage.org

And other webapp instances (moma, ...) because of the reverse proxy change:

bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging moma
Found host moma.softwareheritage.org
WARN     -> Environment "wip-pg-hba-rules-in-yaml" contained non-word characters, correcting name to wip_pg_hba_rules_in_yaml
Cloning into '/tmp/swh-ocd.P1cw2IJt/environments/production/data/private'...
done.
Cloning into '/tmp/swh-ocd.P1cw2IJt/environments/staging/data/private'...
done.
*** Running octocatalog-diff on host moma.softwareheritage.org
I, [2021-01-04T14:08:16.199496 #12412]  INFO -- : Catalogs compiled for moma.softwareheritage.org
I, [2021-01-04T14:08:17.828231 #12412]  INFO -- : Diffs computed for moma.softwareheritage.org
diff origin/production/moma.softwareheritage.org current/moma.softwareheritage.org
*******************************************
  Apache::Vhost[archive.softwareheritage.org_non-ssl] =>
   parameters =>
     serveraliases =>
      - ["base.softwareheritage.org", "archive.internal.softwareheritage.org", "webapp0.softwareheritage.org"]
      + ["base.softwareheritage.org", "archive.internal.softwareheritage.org"]
*******************************************
  Concat::Fragment[archive.softwareheritage.org_non-ssl-serveralias] =>
   parameters =>
     content =>
      @@ -3,3 +3,2 @@
         ServerAlias base.softwareheritage.org
         ServerAlias archive.internal.softwareheritage.org
      -  ServerAlias webapp0.softwareheritage.org
*******************************************
  Concat_fragment[archive.softwareheritage.org_non-ssl-serveralias] =>
   parameters =>
     content =>
      @@ -3,3 +3,2 @@
         ServerAlias base.softwareheritage.org
         ServerAlias archive.internal.softwareheritage.org
      -  ServerAlias webapp0.softwareheritage.org
*******************************************
  File[/etc/softwareheritage/web/web.yml] =>
   parameters =>
     content =>
      @@ -77,4 +77,3 @@
       - base.softwareheritage.org
       - archive.internal.softwareheritage.org
      -- webapp0.softwareheritage.org
      _
*******************************************
  File[/etc/varnish/includes/50_vhost_archive.softwareheritage.org.vcl] =>
   parameters =>
     content =>
      @@ -9,5 +9,4 @@
               req.http.host ~ "^(?i)base\.softwareheritage\.org(:[0-9]+)?$" ||
               req.http.host ~ "^(?i)archive\.internal\.softwareheritage\.org(:[0-9]+)?$" ||
      -        req.http.host ~ "^(?i)webapp0\.softwareheritage\.org(:[0-9]+)?$" ||
               req.http.host ~ "^(?i)archive\.softwareheritage\.org(:[0-9]+)?$"
           ) {
      @@ -26,5 +25,4 @@
               req.http.host ~ "^(?i)base\.softwareheritage\.org(:[0-9]+)?$" ||
               req.http.host ~ "^(?i)archive\.internal\.softwareheritage\.org(:[0-9]+)?$" ||
      -        req.http.host ~ "^(?i)webapp0\.softwareheritage\.org(:[0-9]+)?$" ||
               req.http.host ~ "^(?i)archive\.softwareheritage\.org(:[0-9]+)?$"
           ) {
*******************************************
  Profile::Varnish::Vcl_include[vhost_archive.softwareheritage.org] =>
   parameters =>
     content =>
      @@ -9,5 +9,4 @@
               req.http.host ~ "^(?i)base\.softwareheritage\.org(:[0-9]+)?$" ||
               req.http.host ~ "^(?i)archive\.internal\.softwareheritage\.org(:[0-9]+)?$" ||
      -        req.http.host ~ "^(?i)webapp0\.softwareheritage\.org(:[0-9]+)?$" ||
               req.http.host ~ "^(?i)archive\.softwareheritage\.org(:[0-9]+)?$"
           ) {
      @@ -26,5 +25,4 @@
               req.http.host ~ "^(?i)base\.softwareheritage\.org(:[0-9]+)?$" ||
               req.http.host ~ "^(?i)archive\.internal\.softwareheritage\.org(:[0-9]+)?$" ||
      -        req.http.host ~ "^(?i)webapp0\.softwareheritage\.org(:[0-9]+)?$" ||
               req.http.host ~ "^(?i)archive\.softwareheritage\.org(:[0-9]+)?$"
           ) {
*******************************************
  Profile::Varnish::Vhost[archive.softwareheritage.org] =>
   parameters =>
     aliases =>
      - ["base.softwareheritage.org", "archive.internal.softwareheritage.org", "webapp0.softwareheritage.org"]
      + ["base.softwareheritage.org", "archive.internal.softwareheritage.org"]
*******************************************
  Varnish::Vcl[/etc/varnish/includes/50_vhost_archive.softwareheritage.org.vcl] =>
   parameters =>
     content =>
      @@ -9,5 +9,4 @@
               req.http.host ~ "^(?i)base\.softwareheritage\.org(:[0-9]+)?$" ||
               req.http.host ~ "^(?i)archive\.internal\.softwareheritage\.org(:[0-9]+)?$" ||
      -        req.http.host ~ "^(?i)webapp0\.softwareheritage\.org(:[0-9]+)?$" ||
               req.http.host ~ "^(?i)archive\.softwareheritage\.org(:[0-9]+)?$"
           ) {
      @@ -26,5 +25,4 @@
               req.http.host ~ "^(?i)base\.softwareheritage\.org(:[0-9]+)?$" ||
               req.http.host ~ "^(?i)archive\.internal\.softwareheritage\.org(:[0-9]+)?$" ||
      -        req.http.host ~ "^(?i)webapp0\.softwareheritage\.org(:[0-9]+)?$" ||
               req.http.host ~ "^(?i)archive\.softwareheritage\.org(:[0-9]+)?$"
           ) {
*******************************************
*** End octocatalog-diff on moma.softwareheritage.org

Migrated from D4802 (view on Phabricator)

Decomission webapp0 node

Test Plan

Merge request reports