launchpad-reviewers team mailing list archive

[Colin Watson <mp+451807@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-remove-lgw01 into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Commit message:
vbuilder: Remove lgw01

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-mojo-specs/+git/private/+merge/451807

This will be turned off soon, and we no longer need it as a backup now that we have bos03.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-remove-lgw01 into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index c199d91..6a6c5e3 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -5,25 +5,21 @@
 {%-   set dns_update_host_bos02 = "10.189.128.2" %}
 {%-   set dns_update_host_bos03 = "10.189.128.2" %}
 {%-   set dns_update_host_lcy02 = "10.131.53.11 10.131.53.12 10.131.53.13" %}
-{%-   set dns_update_host_lgw01 = "10.222.128.2" %}
 {%-   set dns_update_key_name = "vbuilder-manage" %}
 {%-   set domain_bos01 = "vbuilder.bos01.scalingstack" %}
 {%-   set domain_bos02 = "vbuilder.bos02.scalingstack" %}
 {%-   set domain_bos03 = "vbuilder.bos03.scalingstack" %}
 {%-   set domain_lcy02 = "vbuilder.lcy02.scalingstack" %}
-{%-   set domain_lgw01 = "vbuilder.lgw01.scalingstack" %}
 {%-   set extra_constraints = "root-disk-source=volume" %}
 {%-   set gss_series = "focal|jammy" %}
 {%-   set instance_key_name_bos01 = "vbuilder-manage-bos01" %}
 {%-   set instance_key_name_bos02 = "vbuilder-manage-bos02" %}
 {%-   set instance_key_name_bos03 = "vbuilder-manage-bos03" %}
 {%-   set instance_key_name_lcy02 = "vbuilder-manage-lcy02" %}
-{%-   set instance_key_name_lgw01 = "vbuilder-manage-lgw01" %}
 {%-   set instance_network_bos01 = "10.189.16.0/20" %}
 {%-   set instance_network_bos02 = "10.189.144.0/20" %}
 {%-   set instance_network_bos03 = "10.143.0.0/20" %}
 {%-   set instance_network_lcy02 = "10.133.0.0/16" %}
-{%-   set instance_network_lgw01 = "10.222.144.0/20" %}
 {%-   set instance_router = "vbuilder_router" %}
 {%-   set instance_router_bos03 = "router_launchpad-vbuilder-production" %}
 {%-   set instance_router_lcy02 = "router_launchpad-vbuilder-production" %}
@@ -44,7 +40,6 @@
 {%-   set vbuilders_bos02 = {"arm64": {"series": "focal", "count": 80, "config_drive": false}, "ppc64el": {"series": "focal", "count": 30}, "s390x": {"series": "focal", "count": 20}} %}
 {%-   set vbuilders_bos03 = {"amd64": {"series": "focal", "count": 60}} %}
 {%-   set vbuilders_lcy02 = {"amd64": {"series": "focal", "count": 120}} %}
-{%-   set vbuilders_lgw01 = {"amd64": {"series": "focal", "count": 60}} %}
 {%-   set vbuilder_prefix = "" %}
 {%- else %}
 {%-   set clamav_database_url = "http://clamav-database-mirror.staging.lp.internal/"; %}
@@ -53,25 +48,21 @@
 {%-   set dns_update_host_bos02 = "10.189.128.2" %}
 {%-   set dns_update_host_bos03 = "10.189.128.2" %}
 {%-   set dns_update_host_lcy02 = "10.132.31.11 10.132.31.12 10.132.31.13" %}
-{%-   set dns_update_host_lgw01 = "10.222.128.2" %}
 {%-   set dns_update_key_name = "vbuilder-staging-manage" %}
 {%-   set domain_bos01 = "vbuilder.staging.bos01.scalingstack" %}
 {%-   set domain_bos02 = "vbuilder.staging.bos02.scalingstack" %}
 {%-   set domain_bos03 = "vbuilder.staging.bos03.scalingstack" %}
 {%-   set domain_lcy02 = "vbuilder.staging.lcy02.scalingstack" %}
-{%-   set domain_lgw01 = "vbuilder.staging.lgw01.scalingstack" %}
 {%-   set extra_constraints = "" %}
 {%-   set gss_series = "focal|jammy" %}
 {%-   set instance_key_name_bos01 = "ppa-manage-test" %}
 {%-   set instance_key_name_bos02 = "ppa-manage-test" %}
 {%-   set instance_key_name_bos03 = "ppa-manage-test" %}
 {%-   set instance_key_name_lcy02 = "ppa-manage-test" %}
-{%-   set instance_key_name_lgw01 = "ppa-manage-test" %}
 {%-   set instance_network_bos01 = "10.189.34.0/24" %}
 {%-   set instance_network_bos02 = "10.189.162.0/23" %}
 {%-   set instance_network_bos03 = "10.144.2.0/23" %}
 {%-   set instance_network_lcy02 = "10.134.2.0/23" %}
-{%-   set instance_network_lgw01 = "10.222.161.0/24" %}
 {%-   set instance_router = "vbuilder_staging_router" %}
 {%-   set instance_router_bos03 = "router_launchpad-vbuilder-staging" %}
 {%-   set instance_router_lcy02 = "router_launchpad-vbuilder-staging" %}
@@ -92,7 +83,6 @@
 {%-   set vbuilders_bos02 = {"arm64": {"series": "jammy", "count": 1, "config_drive": false}, "ppc64el": {"series": "jammy", "count": 1}, "s390x": {"series": "jammy", "count": 1}} %}
 {%-   set vbuilders_bos03 = {"amd64": {"series": "jammy", "count": 4}} %}
 {%-   set vbuilders_lcy02 = {"amd64": {"series": "jammy", "count": 4}} %}
-{%-   set vbuilders_lgw01 = {"amd64": {"series": "jammy", "count": 4}} %}
 {%-   set vbuilder_prefix = "dogfood-" %}
 {%- endif %}
 
@@ -280,21 +270,6 @@ applications:
       region: scalingstack-lcy02
       use_swift: false
       visibility: private
-  glance-simplestreams-sync-lgw01-amd64:
-    charm: {{ charm_dir }}/glance-simplestreams-sync
-    constraints: "{{ extra_constraints }}"
-    num_units: 1
-    options:
-      content_id_template: "{{ content_id_template }}"
-      mirror_list: |-
-        [{url: "http://cloud-images.ubuntu.com/daily/";, name_prefix: "ubuntu:released", path: "streams/v1/index.sjson", max: 3, item_filters: ["release~({{ gss_series }})", "arch~(x86_64|amd64)", "ftype~(disk1.img|disk.img)"]}]
-      name_prefix: "{{ name_prefix }}/"
-      openstack-auth-url: "http://keystone.infra.lgw01.scalingstack:5000/v2.0";
-      openstack-tenant-name: "{{ openstack_tenant_name }}"
-      openstack-username: "{{ openstack_username }}"
-      region: scalingstack-lgw01
-      use_swift: false
-      visibility: private
   launchpad-buildd-image-modifier-amd64:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
@@ -477,29 +452,6 @@ applications:
       openstack-tenant-name: "{{ openstack_tenant_name_lcy02 }}"
       openstack-username: "{{ openstack_username_lcy02 }}"
       vbuilders: '{{ vbuilders("lcy02", vbuilders_lcy02) }}'
-  vbuilder-manage-lgw01:
-    charm: {{ charm_dir }}/vbuilder-manage
-    constraints: "cores=2 mem=4G root-disk=20G {{ extra_constraints }}"
-    expose: true
-    num_units: 1
-    options:
-      amqp-username: vbuilder-manage-lgw01
-      amqp-vhost: vbuilder-manage-lgw01
-      celery-worker-count: "20"
-      dns-update-host: "{{ dns_update_host_lgw01 }}"
-      dns-update-key-name: "{{ dns_update_key_name }}"
-      domain: "{{ domain_lgw01 }}"
-      instance-key-name: "{{ instance_key_name_lgw01 }}"
-      instance-network: "{{ instance_network_lgw01 }}"
-      instance-router: "{{ instance_router }}"
-      log-hosts-allow: 91.189.90.14
-      lp-buildd-managers: "{{ lp_buildd_managers }}"
-      lp-environment: "{{ lp_environment }}"
-      lp-sshkey: "{{ lp_sshkey }}"
-      openstack-auth-url: http://keystone.infra.lgw01.scalingstack:5000/v2.0
-      openstack-tenant-name: "{{ openstack_tenant_name }}"
-      openstack-username: "{{ openstack_username }}"
-      vbuilders: '{{ vbuilders("lgw01", vbuilders_lgw01) }}'
   clamav-database-mirror:
     charm: ch:clamav-database-mirror
     series: jammy
@@ -535,12 +487,10 @@ relations:
   - ["glance-simplestreams-sync-bos02-s390x:image-modifier", "launchpad-buildd-image-modifier-bos02-s390x:image-modifier"]
   - ["glance-simplestreams-sync-bos03-amd64:image-modifier", "launchpad-buildd-image-modifier-bos03-amd64:image-modifier"]
   - ["glance-simplestreams-sync-lcy02-amd64:image-modifier", "launchpad-buildd-image-modifier-amd64:image-modifier"]
-  - ["glance-simplestreams-sync-lgw01-amd64:image-modifier", "launchpad-buildd-image-modifier-amd64:image-modifier"]
   - ["vbuilder-manage-bos01:amqp", "rabbitmq-server:amqp"]
   - ["vbuilder-manage-bos02:amqp", "rabbitmq-server:amqp"]
   - ["vbuilder-manage-bos03:amqp", "rabbitmq-server:amqp"]
   - ["vbuilder-manage-lcy02:amqp", "rabbitmq-server:amqp"]
-  - ["vbuilder-manage-lgw01:amqp", "rabbitmq-server:amqp"]
   - ["rabbitmq-server", "ntp"]
   - ["glance-simplestreams-sync-bos01-amd64", "ntp"]
   - ["glance-simplestreams-sync-bos01-arm64", "ntp"]
@@ -552,10 +502,8 @@ relations:
   - ["glance-simplestreams-sync-bos02-s390x", "ntp"]
   - ["glance-simplestreams-sync-bos03-amd64", "ntp"]
   - ["glance-simplestreams-sync-lcy02-amd64", "ntp"]
-  - ["glance-simplestreams-sync-lgw01-amd64", "ntp"]
   - ["vbuilder-manage-bos01", "ntp"]
   - ["vbuilder-manage-bos02", "ntp"]
   - ["vbuilder-manage-bos03", "ntp"]
   - ["vbuilder-manage-lcy02", "ntp"]
-  - ["vbuilder-manage-lgw01", "ntp"]
   - ["clamav-database-mirror", "ntp"]
diff --git a/vbuilder/rebuild-images b/vbuilder/rebuild-images
index 52935c4..5246cd1 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -22,7 +22,6 @@ targets_by_stage = {
         ("bos02", "s390x", "jammy"),
         ("bos03", "amd64", "jammy"),
         ("lcy02", "amd64", "jammy"),
-        ("lgw01", "amd64", "jammy"),
         ],
     "production": [
         ("bos01", "amd64", "focal"),
@@ -34,7 +33,6 @@ targets_by_stage = {
         ("bos02", "s390x", "focal"),
         ("bos03", "amd64", "focal"),
         ("lcy02", "amd64", "focal"),
-        ("lgw01", "amd64", "focal"),
         ],
     }
 
diff --git a/vbuilder/upgrade-charms b/vbuilder/upgrade-charms
index b4c8e1a..471b7c4 100755
--- a/vbuilder/upgrade-charms
+++ b/vbuilder/upgrade-charms
@@ -28,8 +28,6 @@ apps = [
      'glance-simplestreams-sync'),
     ('glance-simplestreams-sync-lcy02-amd64',
      'glance-simplestreams-sync'),
-    ('glance-simplestreams-sync-lgw01-amd64',
-     'glance-simplestreams-sync'),
     ('launchpad-buildd-image-modifier-amd64',
      'launchpad-buildd-image-modifier'),
     ('launchpad-buildd-image-modifier-bos01-amd64',
@@ -52,8 +50,6 @@ apps = [
      'vbuilder-manage'),
     ('vbuilder-manage-lcy02',
      'vbuilder-manage'),
-    ('vbuilder-manage-lgw01',
-     'vbuilder-manage'),
     ]
 
 for app_name, charm_name in apps: