launchpad-reviewers team mailing list archive

[Colin Watson <mp+417601@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/lp-codeimport:charm-launchpad-ppa into lp-codeimport:master.

Commit message:
charm: Use ppa:launchpad/ppa by default

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lp-codeimport/+git/lp-codeimport/+merge/417601

This matches what we test against (`ols-vms.conf`).
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lp-codeimport:charm-launchpad-ppa into lp-codeimport:master.

diff --git a/charm/lp-codeimport/config.yaml b/charm/lp-codeimport/config.yaml
index 4b2e62d..cac88ce 100644
--- a/charm/lp-codeimport/config.yaml
+++ b/charm/lp-codeimport/config.yaml
@@ -78,3 +78,10 @@ options:
     description: >
       Hosts that should be allowed to rsync logs. Note that this relies on
       the nrpe subordinate charm to set up /etc/rsyncd.conf properly.
+  # layer-apt
+  install_sources:
+    default: |
+      - ppa:launchpad/ppa
+  install_keys:
+    default: |
+      - null  # PPA keys securely added via Launchpad.