launchpad-reviewers team mailing list archive

[Colin Watson <mp+455518@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-update-log-hosts-allow into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Commit message:
vbuilder: Allow launchpad-bastion-ps5.internal to rsync logs

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index 05a5701..c00ca4a 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -1,3 +1,5 @@
+{%- set log_hosts_allow = "carob.canonical.com launchpad-bastion-ps5.internal" %}
+
 {%- if stage_name == "production" %}
 {%-   set clamav_database_url = "http://clamav-database-mirror.lp.internal/"; %}
 {%-   set content_id_template = "launchpad-buildd:production" %}
@@ -481,7 +483,7 @@ applications:
       instance-key-name: "{{ instance_key_name_bos01 }}"
       instance-network: "{{ instance_network_bos01 }}"
       instance-router: "{{ instance_router }}"
-      log-hosts-allow: 91.189.90.14
+      log-hosts-allow: "{{ log_hosts_allow }}"
       lp-buildd-managers: "{{ lp_buildd_managers }}"
       lp-environment: "{{ lp_environment }}"
       lp-sshkey: "{{ lp_sshkey }}"
@@ -505,7 +507,7 @@ applications:
       instance-key-name: "{{ instance_key_name_bos02 }}"
       instance-network: "{{ instance_network_bos02 }}"
       instance-router: "{{ instance_router }}"
-      log-hosts-allow: 91.189.90.14
+      log-hosts-allow: "{{ log_hosts_allow }}"
       lp-buildd-managers: "{{ lp_buildd_managers }}"
       lp-environment: "{{ lp_environment }}"
       lp-sshkey: "{{ lp_sshkey }}"
@@ -528,7 +530,7 @@ applications:
       instance-key-name: "{{ instance_key_name_bos03 }}"
       instance-network: "{{ instance_network_bos03 }}"
       instance-router: "{{ instance_router_bos03 }}"
-      log-hosts-allow: 91.189.90.14
+      log-hosts-allow: "{{ log_hosts_allow }}"
       lp-buildd-managers: "{{ lp_buildd_managers }}"
       lp-environment: "{{ lp_environment }}"
       lp-sshkey: "{{ lp_sshkey }}"
@@ -552,7 +554,7 @@ applications:
       instance-key-name: "{{ instance_key_name_lcy02 }}"
       instance-network: "{{ instance_network_lcy02 }}"
       instance-router: "{{ instance_router_lcy02 }}"
-      log-hosts-allow: 91.189.90.14
+      log-hosts-allow: "{{ log_hosts_allow }}"
       lp-buildd-managers: "{{ lp_buildd_managers }}"
       lp-environment: "{{ lp_environment }}"
       lp-sshkey: "{{ lp_sshkey }}"