launchpad-reviewers team mailing list archive

[Colin Watson <mp+441588@xxxxxxxxxxxxxxxxxx>]

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

Commit message:
vbuilder: Add bos03 for staging

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-mojo-specs/+git/private/+merge/441588
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-staging-bos03 into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index 5a13951..18b9b22 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -44,24 +44,29 @@
 {%-   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_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" %}
 {%-   set launchpad_buildd_repository = "ppa:launchpad/buildd-staging" %}
 {%-   set lp_buildd_managers_lfp = "91.189.90.132" %}
@@ -72,11 +77,14 @@
 {%-   set modifiers_bos02 = '{"arm64": "10.44.0.13", "ppc64el": "10.44.0.19", "s390x": "10.44.0.14"}' %}
 {%-   set name_prefix = "launchpad-buildd-staging" %}
 {%-   set openstack_tenant_name = "vbuilder_staging_project" %}
+{%-   set openstack_tenant_name_bos03 = "launchpad-vbuilder-staging_project" %}
 {%-   set openstack_tenant_name_lcy02 = "launchpad-vbuilder-staging_project" %}
 {%-   set openstack_username = "vbuilder_staging" %}
+{%-   set openstack_username_bos03 = "launchpad-vbuilder-staging" %}
 {%-   set openstack_username_lcy02 = "launchpad-vbuilder-staging" %}
 {%-   set vbuilders_bos01 = {"amd64": ("jammy", "vbuilder-gpu", 1, true), "arm64": ("jammy", "vbuilder", 1, false), "ppc64el": ("jammy", "vbuilder", 1, true), "s390x": ("jammy", "vbuilder", 1, true)} %}
 {%-   set vbuilders_bos02 = {"arm64": ("jammy", "vbuilder", 1, false), "ppc64el": ("jammy", "vbuilder", 1, true), "s390x": ("jammy", "vbuilder", 1, true)} %}
+{%-   set vbuilders_bos03 = {"amd64": ("jammy", "vbuilder", 4, true)} %}
 {%-   set vbuilders_lcy02 = {"amd64": ("jammy", "vbuilder", 4, true)} %}
 {%-   set vbuilders_lgw01 = {"amd64": ("jammy", "vbuilder", 4, true)} %}
 {%-   set vbuilder_prefix = "dogfood-" %}
@@ -217,6 +225,24 @@ applications:
       region: scalingstack-bos02
       use_swift: false
       visibility: private
+{%- if stage_name == "staging" %}
+  glance-simplestreams-sync-bos03-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: "https://keystone.ps6.canonical.com:5000/v3";
+      openstack-identity-api-version: "3"
+      openstack-tenant-name: "{{ openstack_tenant_name_bos03 }}"
+      openstack-username: "{{ openstack_username_bos03 }}"
+      region: scalingstack-bos03
+      use_swift: false
+      visibility: private
+{%- endif %}
   glance-simplestreams-sync-lcy02-amd64:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -319,6 +345,14 @@ applications:
       remote-modifiers: '{{ modifiers_bos02 }}'
       remote-modifier-private-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder
       remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
+{%- if stage_name == "staging" %}
+  launchpad-buildd-image-modifier-bos03-amd64:
+    charm: {{ charm_dir }}/launchpad-buildd-image-modifier
+    options:
+      clamav-database-url: "{{ clamav_database_url }}"
+      launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
+      linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
+{%- endif %}
   vbuilder-manage-bos01:
     charm: {{ charm_dir }}/vbuilder-manage
     constraints: "cores=2 mem=8G root-disk=20G {{ extra_constraints }}"
@@ -366,6 +400,32 @@ applications:
       openstack-tenant-name: "{{ openstack_tenant_name }}"
       openstack-username: "{{ openstack_username }}"
       vbuilders: '{{ vbuilders("bos02", vbuilders_bos02) }}'
+{%- if stage_name == "staging" %}
+  vbuilder-manage-bos03:
+    charm: {{ charm_dir }}/vbuilder-manage
+    constraints: "cores=4 mem=8G root-disk=50G {{ extra_constraints }}"
+    expose: true
+    num_units: 1
+    options:
+      amqp-username: vbuilder-manage-bos03
+      amqp-vhost: vbuilder-manage-bos03
+      celery-worker-count: "50"
+      dns-update-host: "{{ dns_update_host_bos03 }}"
+      dns-update-key-name: "{{ dns_update_key_name }}"
+      domain: "{{ domain_bos03 }}"
+      instance-key-name: "{{ instance_key_name_bos03 }}"
+      instance-network: "{{ instance_network_bos03 }}"
+      instance-router: "{{ instance_router_bos03 }}"
+      log-hosts-allow: 91.189.90.14
+      lp-buildd-managers: "{{ lp_buildd_managers }}"
+      lp-environment: "{{ lp_environment }}"
+      lp-sshkey: "{{ lp_sshkey }}"
+      openstack-auth-url: "https://keystone.ps6.canonical.com:5000/v3";
+      openstack-identity-api-version: "3"
+      openstack-tenant-name: "{{ openstack_tenant_name_bos03 }}"
+      openstack-username: "{{ openstack_username_bos03 }}"
+      vbuilders: '{{ vbuilders("bos03", vbuilders_bos03) }}'
+{%- endif %}
   vbuilder-manage-lcy02:
     charm: {{ charm_dir }}/vbuilder-manage
     constraints: "cores=4 mem=8G root-disk=50G {{ extra_constraints }}"
@@ -445,10 +505,16 @@ 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"]
+{%- if stage_name == "staging" %}
+  - ["glance-simplestreams-sync-bos03-amd64:image-modifier", "launchpad-buildd-image-modifier-bos03-amd64:image-modifier"]
+{%- endif %}
   - ["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"]
+{%- if stage_name == "staging" %}
+  - ["vbuilder-manage-bos03:amqp", "rabbitmq-server:amqp"]
+{%- endif %}
   - ["vbuilder-manage-lcy02:amqp", "rabbitmq-server:amqp"]
   - ["vbuilder-manage-lgw01:amqp", "rabbitmq-server:amqp"]
   - ["rabbitmq-server", "ntp"]
@@ -459,10 +525,16 @@ relations:
   - ["glance-simplestreams-sync-bos02-arm64", "ntp"]
   - ["glance-simplestreams-sync-bos02-ppc64el", "ntp"]
   - ["glance-simplestreams-sync-bos02-s390x", "ntp"]
+{%- if stage_name == "staging" %}
+  - ["glance-simplestreams-sync-bos03-amd64", "ntp"]
+{%- endif %}
   - ["glance-simplestreams-sync-lcy02-amd64", "ntp"]
   - ["glance-simplestreams-sync-lgw01-amd64", "ntp"]
   - ["vbuilder-manage-bos01", "ntp"]
   - ["vbuilder-manage-bos02", "ntp"]
+{%- if stage_name == "staging" %}
+  - ["vbuilder-manage-bos03", "ntp"]
+{%- endif %}
   - ["vbuilder-manage-lcy02", "ntp"]
   - ["vbuilder-manage-lgw01", "ntp"]
   - ["clamav-database-mirror", "ntp"]
diff --git a/vbuilder/rebuild-images b/vbuilder/rebuild-images
index 06b7065..5f52f38 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -19,6 +19,7 @@ targets_by_stage = {
         ("bos02", "arm64", "jammy"),
         ("bos02", "ppc64el", "jammy"),
         ("bos02", "s390x", "jammy"),
+        ("bos03", "amd64", "jammy"),
         ("lcy02", "amd64", "jammy"),
         ("lgw01", "amd64", "jammy"),
         ],
diff --git a/vbuilder/upgrade-charms b/vbuilder/upgrade-charms
index 2362009..b4c8e1a 100755
--- a/vbuilder/upgrade-charms
+++ b/vbuilder/upgrade-charms
@@ -24,6 +24,8 @@ apps = [
      'glance-simplestreams-sync'),
     ('glance-simplestreams-sync-bos02-s390x',
      'glance-simplestreams-sync'),
+    ('glance-simplestreams-sync-bos03-amd64',
+     'glance-simplestreams-sync'),
     ('glance-simplestreams-sync-lcy02-amd64',
      'glance-simplestreams-sync'),
     ('glance-simplestreams-sync-lgw01-amd64',
@@ -46,6 +48,8 @@ apps = [
      'launchpad-buildd-image-modifier'),
     ('vbuilder-manage-bos02',
      'vbuilder-manage'),
+    ('vbuilder-manage-bos03',
+     'vbuilder-manage'),
     ('vbuilder-manage-lcy02',
      'vbuilder-manage'),
     ('vbuilder-manage-lgw01',