← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~pelpsi/launchpad-mojo-specs/+git/private:drs01-flag-qastaging into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder

 

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

Commit message:
vbuilder: protect drs01 with flag.

Requested reviews:
  Simone Pelosi (pelpsi)

For more details, see:
https://code.launchpad.net/~pelpsi/launchpad-mojo-specs/+git/private/+merge/493396
-- 
Your team Launchpad code reviewers is subscribed to branch ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.
diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index 93b3e6d..99b216f 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -422,7 +422,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") %}
+{%- if stage_name in ("qastaging") %}
   vbuilder-manage-drs01:
     charm: {{ charm_dir }}/vbuilder-manage
     constraints: "cores=4 mem=8G root-disk=50G {{ extra_constraints }}"
@@ -483,7 +483,7 @@ 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"]
-{%- if stage_name in ("production", "qastaging") %}
+{%- if stage_name in ("qastaging") %}
   - ["vbuilder-manage-drs01:amqp", "rabbitmq-server:amqp"]
 {%- endif %}
   - ["rabbitmq-server", "ntp"]
@@ -499,7 +499,7 @@ relations:
   - ["glance-simplestreams-sync-lcy02-amd64", "ntp"]
   - ["vbuilder-manage-bos03", "ntp"]
   - ["vbuilder-manage-lcy02", "ntp"]
-{%- if stage_name in ("production", "qastaging") %}
+{%- if stage_name in ("qastaging") %}
   - ["vbuilder-manage-drs01", "ntp"]
 {%- endif %}
   - ["clamav-database-mirror", "ntp"]

References