launchpad-reviewers team mailing list archive

[Colin Watson <mp+433885@xxxxxxxxxxxxxxxxxx>]

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

Commit message:
Bring production bos01 back up

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

Let's restore bos01 on production so that we have some redundancy.  I've used slightly more conservative builder counts for now.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-production-bos01 into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index 62768b7..7240cb3 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -26,14 +26,14 @@
 {%-   set lp_buildd_managers = "91.189.89.254 10.131.66.156" %}
 {%-   set lp_environment = "production" %}
 {%-   set lp_sshkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD3tBvyEaZFX8H4krfXGhczq9q/GCfcE0kpsjK8WzM/lQOhWQAVSmm8O9gposKvu4mT28hBWI746+NOPLBrf9ax7YRoU+ZuZesyIIK6ztN07G4aK2vt+1W9yNZKgTJZ8FvxHwlbFy6wMjMP3OzuxWyh0yi03z1YiGPJt0riJRZT+QecaoyYhkTuRbcCoWbhmM0veUjCvfR7LA43YbOfmts7STNCtl1IUJErmUY6fSR1LkyF9uJSdwozAVht242vI8Yg+PrOnKCx3X5w546okP2uMDVXKWeY2g/MhUSr+ZyIaS2JxUygZ7FKS4gNLYb3O4Q6tcIwPE++zsr9HueTfjw2LyeQTZQDQjuv0kJ40B3IFF4E9FMzu8MDwArOKUGzISLrX5VtDZBKINDclfDbrFWHUlVBC2CIIjGPKj3afluP9jadWjsOQx0ooBO0tb0Se+7t3oNjKlknwD85AYCPzIlZt7wo/+e/V/Tilw+UUf00JioEceTdxuOHmbuxP5RzCleg8pYLfe5jiHfBJi0DhO61IYlFMgSToh78EShHWYEdSbD+Ve5GWKvPEU9CsSTleSSqBFdhyggfB5fHiup0efAqMnstDn5sxGYFzfFu7SNVHkMuFeiRHZK+9fF/nfzk0UK5EaGs+4IMhWS1ns8m5O5Li609c/nXK5t5fBOkiWa+RQ== lp_buildd@juju-4112d9-prod-launchpad-manual-servers-4" %}
-{%-   set modifiers_bos01 = '{}' %}
+{%-   set modifiers_bos01 = '{"arm64": "10.43.0.29", "ppc64el": "10.43.0.36", "s390x": "10.43.0.39"}' %}
 {%-   set modifiers_bos02 = '{"arm64": "10.44.0.22", "ppc64el": "10.44.0.20", "s390x": "10.44.0.18"}' %}
 {%-   set name_prefix = "launchpad-buildd" %}
 {%-   set openstack_tenant_name = "vbuilder_project" %}
 {%-   set openstack_tenant_name_lcy02 = "launchpad-vbuilder-production_project" %}
 {%-   set openstack_username = "vbuilder" %}
 {%-   set openstack_username_lcy02 = "launchpad-vbuilder-production" %}
-{%-   set vbuilders_bos01 = {} %}
+{%-   set vbuilders_bos01 = {"arm64": ("focal", 40, false), "ppc64el": ("focal", 20, true), "s390x": ("focal", 20, true)} %}
 {%-   set vbuilders_bos02 = {"arm64": ("focal", 80, false), "ppc64el": ("focal", 30, true), "s390x": ("focal", 20, true)} %}
 {%-   set vbuilders_lcy02 = {"amd64": ("focal", 120, true)} %}
 {%-   set vbuilders_lgw01 = {"amd64": ("focal", 60, true)} %}
@@ -100,7 +100,6 @@ applications:
     charm: cs:rabbitmq-server
     constraints: "cores=2 mem=8G root-disk=20G {{ extra_constraints }}"
     num_units: 2
-{%- if stage_name == "staging" %}
   glance-simplestreams-sync-bos01-arm64:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -152,7 +151,6 @@ applications:
       region: scalingstack-bos01
       use_swift: false
       visibility: private
-{%- endif %}
   glance-simplestreams-sync-bos02-arm64:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -237,7 +235,6 @@ applications:
     options:
       launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
       linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
-{%- if stage_name == "staging" %}
   launchpad-buildd-image-modifier-bos01-arm64:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
@@ -262,7 +259,6 @@ applications:
       remote-modifiers: '{{ modifiers_bos01 }}'
       remote-modifier-private-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder
       remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
-{%- endif %}
   launchpad-buildd-image-modifier-bos02-arm64:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
@@ -287,7 +283,6 @@ 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" %}
   vbuilder-manage-bos01:
     charm: {{ charm_dir }}/vbuilder-manage
     constraints: "cores=2 mem=8G root-disk=20G {{ extra_constraints }}"
@@ -312,7 +307,6 @@ applications:
       openstack-tenant-name: "{{ openstack_tenant_name }}"
       openstack-username: "{{ openstack_username }}"
       vbuilders: '{{ vbuilders("bos01", vbuilders_bos01) }}'
-{%- endif %}
   vbuilder-manage-bos02:
     charm: {{ charm_dir }}/vbuilder-manage
     constraints: "cores=2 mem=8G root-disk=20G {{ extra_constraints }}"
@@ -407,36 +401,28 @@ applications:
           pattern = "/usr/local/sbin/ppa-reset"
       install_method: snap
 relations:
-{%- if stage_name == "staging" %}
   - ["glance-simplestreams-sync-bos01-arm64:image-modifier", "launchpad-buildd-image-modifier-bos01-arm64:image-modifier"]
   - ["glance-simplestreams-sync-bos01-ppc64el:image-modifier", "launchpad-buildd-image-modifier-bos01-ppc64el:image-modifier"]
   - ["glance-simplestreams-sync-bos01-s390x:image-modifier", "launchpad-buildd-image-modifier-bos01-s390x:image-modifier"]
-{%- endif %}
   - ["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-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-lcy02:amqp", "rabbitmq-server:amqp"]
   - ["vbuilder-manage-lgw01:amqp", "rabbitmq-server:amqp"]
   - ["rabbitmq-server", "ntp"]
-{%- if stage_name == "staging" %}
   - ["glance-simplestreams-sync-bos01-arm64", "ntp"]
   - ["glance-simplestreams-sync-bos01-ppc64el", "ntp"]
   - ["glance-simplestreams-sync-bos01-s390x", "ntp"]
-{%- endif %}
   - ["glance-simplestreams-sync-bos02-arm64", "ntp"]
   - ["glance-simplestreams-sync-bos02-ppc64el", "ntp"]
   - ["glance-simplestreams-sync-bos02-s390x", "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-lcy02", "ntp"]
   - ["vbuilder-manage-lgw01", "ntp"]