launchpad-reviewers team mailing list archive

[Colin Watson <mp+415976@xxxxxxxxxxxxxxxxxx>]

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

Commit message:
vbuilder: Remove lcy01

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

See https://portal.admin.canonical.com/C135989.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-remove-lcy01 into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index c7be938..10c862b 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -2,25 +2,21 @@
 {%-   set content_id_template = "launchpad-buildd:production" %}
 {%-   set dns_update_host_bos01 = "10.189.0.2" %}
 {%-   set dns_update_host_bos02 = "10.189.128.2" %}
-{%-   set dns_update_host_lcy01 = "10.89.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_lcy01 = "vbuilder.lcy01.scalingstack" %}
 {%-   set domain_lcy02 = "vbuilder.lcy02.scalingstack" %}
 {%-   set domain_lgw01 = "vbuilder.lgw01.scalingstack" %}
 {%-   set extra_constraints = "root-disk-source=volume" %}
 {%-   set gss_series = "bionic|focal" %}
 {%-   set instance_key_name_bos01 = "vbuilder-manage-bos01" %}
 {%-   set instance_key_name_bos02 = "vbuilder-manage-bos02" %}
-{%-   set instance_key_name_lcy01 = "vbuilder-manage-lcy01" %}
 {%-   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_lcy01 = "10.89.144.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" %}
@@ -39,7 +35,6 @@
 {%-   set openstack_username_lcy02 = "launchpad-vbuilder-production" %}
 {%-   set vbuilders_bos01 = {} %}
 {%-   set vbuilders_bos02 = {"arm64": ("focal", 80), "ppc64el": ("focal", 30), "s390x": ("focal", 20)} %}
-{%-   set vbuilders_lcy01 = {"amd64": ("focal", 30)} %}
 {%-   set vbuilders_lcy02 = {"amd64": ("focal", 120)} %}
 {%-   set vbuilders_lgw01 = {"amd64": ("focal", 60)} %}
 {%-   set vbuilder_prefix = "" %}
@@ -47,25 +42,21 @@
 {%-   set content_id_template = "launchpad-buildd:staging" %}
 {%-   set dns_update_host_bos01 = "10.189.0.2" %}
 {%-   set dns_update_host_bos02 = "10.189.128.2" %}
-{%-   set dns_update_host_lcy01 = "10.89.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_lcy01 = "vbuilder.staging.lcy01.scalingstack" %}
 {%-   set domain_lcy02 = "vbuilder.staging.lcy02.scalingstack" %}
 {%-   set domain_lgw01 = "vbuilder.staging.lgw01.scalingstack" %}
 {%-   set extra_constraints = "" %}
 {%-   set gss_series = "bionic|focal" %}
 {%-   set instance_key_name_bos01 = "ppa-manage-test" %}
 {%-   set instance_key_name_bos02 = "ppa-manage-test" %}
-{%-   set instance_key_name_lcy01 = "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_lcy01 = "10.89.161.0/24" %}
 {%-   set instance_network_lcy02 = "10.134.2.0/23" %}
 {%-   set instance_network_lgw01 = "10.222.161.0/24" %}
 {%-   set instance_router = "vbuilder_staging_router" %}
@@ -84,7 +75,6 @@
 {%-   set openstack_username_lcy02 = "launchpad-vbuilder-staging" %}
 {%-   set vbuilders_bos01 = {"arm64": ("focal", 1), "ppc64el": ("focal", 1), "s390x": ("focal", 1)} %}
 {%-   set vbuilders_bos02 = {"arm64": ("focal", 1), "ppc64el": ("focal", 1), "s390x": ("focal", 1)} %}
-{%-   set vbuilders_lcy01 = {"amd64": ("focal", 4)} %}
 {%-   set vbuilders_lcy02 = {"amd64": ("focal", 4)} %}
 {%-   set vbuilders_lgw01 = {"amd64": ("focal", 4)} %}
 {%-   set vbuilder_prefix = "dogfood-" %}
@@ -211,21 +201,6 @@ applications:
       region: scalingstack-bos02
       use_swift: false
       visibility: private
-  glance-simplestreams-sync-lcy01-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.lcy01.scalingstack:5000/v2.0";
-      openstack-tenant-name: "{{ openstack_tenant_name }}"
-      openstack-username: "{{ openstack_username }}"
-      region: scalingstack-lcy01
-      use_swift: false
-      visibility: private
   glance-simplestreams-sync-lcy02-amd64:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -356,29 +331,6 @@ applications:
       openstack-tenant-name: "{{ openstack_tenant_name }}"
       openstack-username: "{{ openstack_username }}"
       vbuilders: '{{ vbuilders("bos02", vbuilders_bos02) }}'
-  vbuilder-manage-lcy01:
-    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-lcy01
-      amqp-vhost: vbuilder-manage-lcy01
-      celery-worker-count: "20"
-      dns-update-host: "{{ dns_update_host_lcy01 }}"
-      dns-update-key-name: "{{ dns_update_key_name }}"
-      domain: "{{ domain_lcy01 }}"
-      instance-key-name: "{{ instance_key_name_lcy01 }}"
-      instance-network: "{{ instance_network_lcy01 }}"
-      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.lcy01.scalingstack:5000/v2.0
-      openstack-tenant-name: "{{ openstack_tenant_name }}"
-      openstack-username: "{{ openstack_username }}"
-      vbuilders: '{{ vbuilders("lcy01", vbuilders_lcy01) }}'
   vbuilder-manage-lcy02:
     charm: {{ charm_dir }}/vbuilder-manage
     constraints: "cores=2 mem=4G root-disk=20G {{ extra_constraints }}"
@@ -451,14 +403,12 @@ relations:
   - ["glance-simplestreams-sync-bos02-arm64:image-modifier", "launchpad-buildd-image-modifier-bos02-arm64:image-modifier"]
   - ["glance-simplestreams-sync-bos02-ppc64el:image-modifier", "launchpad-buildd-image-modifier-bos02-ppc64el:image-modifier"]
   - ["glance-simplestreams-sync-bos02-s390x:image-modifier", "launchpad-buildd-image-modifier-bos02-s390x:image-modifier"]
-  - ["glance-simplestreams-sync-lcy01-amd64:image-modifier", "launchpad-buildd-image-modifier-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"]
 {%- if stage_name == "staging" %}
   - ["vbuilder-manage-bos01:amqp", "rabbitmq-server:amqp"]
 {%- endif %}
   - ["vbuilder-manage-bos02:amqp", "rabbitmq-server:amqp"]
-  - ["vbuilder-manage-lcy01:amqp", "rabbitmq-server:amqp"]
   - ["vbuilder-manage-lcy02:amqp", "rabbitmq-server:amqp"]
   - ["vbuilder-manage-lgw01:amqp", "rabbitmq-server:amqp"]
   - ["rabbitmq-server", "ntp"]
@@ -470,13 +420,11 @@ relations:
   - ["glance-simplestreams-sync-bos02-arm64", "ntp"]
   - ["glance-simplestreams-sync-bos02-ppc64el", "ntp"]
   - ["glance-simplestreams-sync-bos02-s390x", "ntp"]
-  - ["glance-simplestreams-sync-lcy01-amd64", "ntp"]
   - ["glance-simplestreams-sync-lcy02-amd64", "ntp"]
   - ["glance-simplestreams-sync-lgw01-amd64", "ntp"]
 {%- if stage_name == "staging" %}
   - ["vbuilder-manage-bos01", "ntp"]
 {%- endif %}
   - ["vbuilder-manage-bos02", "ntp"]
-  - ["vbuilder-manage-lcy01", "ntp"]
   - ["vbuilder-manage-lcy02", "ntp"]
   - ["vbuilder-manage-lgw01", "ntp"]
diff --git a/vbuilder/rebuild-images b/vbuilder/rebuild-images
index 36643a9..79d61cb 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -18,7 +18,6 @@ targets_by_stage = {
         ("bos02", "arm64", "focal"),
         ("bos02", "ppc64el", "focal"),
         ("bos02", "s390x", "focal"),
-        ("lcy01", "amd64", "focal"),
         ("lcy02", "amd64", "focal"),
         ("lgw01", "amd64", "focal"),
         ],
@@ -26,7 +25,6 @@ targets_by_stage = {
         ("bos02", "arm64", "focal"),
         ("bos02", "ppc64el", "focal"),
         ("bos02", "s390x", "focal"),
-        ("lcy01", "amd64", "focal"),
         ("lcy02", "amd64", "focal"),
         ("lgw01", "amd64", "focal"),
         ],