← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~pelpsi/launchpad-mojo-specs/+git/private:protect-drs01-with-flags into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder

 

Simone Pelosi has proposed merging ~pelpsi/launchpad-mojo-specs/+git/private:protect-drs01-with-flags into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Commit message:
vbuilder: protect drs01 with flag.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~pelpsi/launchpad-mojo-specs/+git/private/+merge/493394
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~pelpsi/launchpad-mojo-specs/+git/private:protect-drs01-with-flags into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.
diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index ad981ff..d744cbb 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -423,6 +423,7 @@ applications:
       openstack-tenant-name: "{{ openstack_tenant_name_lcy02 }}"
       openstack-username: "{{ openstack_username_lcy02 }}"
       vbuilders: '{{ vbuilders("lcy02", vbuilders_lcy02) }}'
+{%- if stage_name in ("production", "qastaging") %}
   vbuilder-manage-drs01:
     charm: {{ charm_dir }}/vbuilder-manage
     constraints: "cores=4 mem=8G root-disk=50G {{ extra_constraints }}"
@@ -445,6 +446,7 @@ applications:
       openstack-tenant-name: "{{ openstack_tenant_name_drs01 }}"
       openstack-username: "{{ openstack_username_drs01 }}"
       vbuilders: '{{ vbuilders("drs01", vbuilders_drs01) }}'
+{%- endif %}
   clamav-database-mirror:
     charm: ch:clamav-database-mirror
     series: jammy
@@ -482,7 +484,9 @@ relations:
   - ["glance-simplestreams-sync-lcy02-amd64:image-modifier", "launchpad-buildd-image-modifier-amd64:image-modifier"]
   - ["vbuilder-manage-bos03:amqp", "rabbitmq-server:amqp"]
   - ["vbuilder-manage-lcy02:amqp", "rabbitmq-server:amqp"]
-  - ["vbuilder-manage-drs01:amqp", "rabbitmq-server:amqp
+{%- if stage_name in ("production", "qastaging") %}
+  - ["vbuilder-manage-drs01:amqp", "rabbitmq-server:amqp"]
+{%- endif %}
   - ["rabbitmq-server", "ntp"]
   - ["glance-simplestreams-sync-bos03-amd64", "ntp"]
   - ["glance-simplestreams-sync-bos03-amd64-gpu", "ntp"]
@@ -496,5 +500,7 @@ relations:
   - ["glance-simplestreams-sync-lcy02-amd64", "ntp"]
   - ["vbuilder-manage-bos03", "ntp"]
   - ["vbuilder-manage-lcy02", "ntp"]
+{%- if stage_name in ("production", "qastaging") %}
   - ["vbuilder-manage-drs01", "ntp"]
+{%- endif %}
   - ["clamav-database-mirror", "ntp"]

Follow ups