Merge ~lgp171188/launchpad-mojo-specs:grant-ppa-publisher-logs-access-to-ubuntu-archive-administrators into launchpad-mojo-specs:master

[Guruprasad]

Allow Ubuntu archive administrators access to PPA publisher logs

[Guruprasad (lgp171188)]

This is similar to https://code.launchpad.net/~vorlon/launchpad-mojo-specs/+git/launchpad-mojo-specs/+merge/463316 and https://code.launchpad.net/~lgp171188/launchpad-mojo-specs/+git/launchpad-mojo-specs/+merge/463512

[Ines Almeida (ines-almeida)]

LGTM

review: Approve

diff --git a/lp/bundle.yaml b/lp/bundle.yaml
index 5a04a65..e19a439 100644
--- a/lp/bundle.yaml
+++ b/lp/bundle.yaml
@@ -642,7 +642,7 @@
       gpg_upload_keys: "{{ gpg_upload_keys }}"
       http_proxy: "{{ http_proxy }}"
       is_demo: "{{ is_demo }}"
-{%- if stage_name == "production" and application.startswith("launchpad-ftpmaster-") %}
+{%- if stage_name == "production" and (application.startswith("launchpad-ftpmaster-") or application == "launchpad-ppa-publisher") %}
       # Ubuntu release team members and Ubuntu archive administrators have a legitimate
       # interest in reading ftpmaster logs.
       log_hosts_allow: "{{ log_hosts_allow }} ubuntu-release-bastion-ps5.internal ubuntu-archive-bastion-ps5.internal"
diff --git a/lp/configs/custom-secgroups-production.yaml b/lp/configs/custom-secgroups-production.yaml
index 2dceb4e..b856aec 100644
--- a/lp/configs/custom-secgroups-production.yaml
+++ b/lp/configs/custom-secgroups-production.yaml
@@ -81,6 +81,7 @@ applications:
         rules:
             - ppa-lb-http-access
             - rsync-logs
+            - rsync-logs-ubuntu-archive
     launchpad-ppa-uploader:
         type: neutron
         rules: