launchpad-reviewers team mailing list archive

[Guruprasad <mp+483672@xxxxxxxxxxxxxxxxxx>]

Guruprasad has proposed merging ~lgp171188/launchpad:charm-launchpad-codehosting-add-bazaar-sync-source-config into launchpad:master.

Commit message:
charm/launchpad-codehosting: Add configuration for bzr branch sync from production


This is used by the staging environment to sync branches for testing

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad/+git/launchpad/+merge/483672
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad:charm-launchpad-codehosting-add-bazaar-sync-source-config into launchpad:master.

diff --git a/charm/launchpad-codehosting/config.yaml b/charm/launchpad-codehosting/config.yaml
index 67d432c..65ff213 100644
--- a/charm/launchpad-codehosting/config.yaml
+++ b/charm/launchpad-codehosting/config.yaml
@@ -9,6 +9,12 @@ options:
       Space-separated list of hosts that should be allowed to rsync Bazaar
       repositories (both public and private).
     default: ""
+  bzr_repositories_sync_branches_source:
+    type: string
+    description: >
+      The rsync module to use in pre-production environmentsfor sync'ing some
+      bzr branches from production for testing. This is not used in production.
+    default: ""
   codehosting_private_ssh_key:
     type: string
     description: >
diff --git a/charm/launchpad-codehosting/templates/launchpad-codehosting-lazr-common.conf.j2 b/charm/launchpad-codehosting/templates/launchpad-codehosting-lazr-common.conf.j2
index 3a1a521..3126ed7 100644
--- a/charm/launchpad-codehosting/templates/launchpad-codehosting-lazr-common.conf.j2
+++ b/charm/launchpad-codehosting/templates/launchpad-codehosting-lazr-common.conf.j2
@@ -21,6 +21,7 @@ internal_branch_by_id_root: {{ internal_branch_by_id_root }}
 internal_codebrowse_root: {{ internal_codebrowse_root }}
 mirrored_branches_root: {{ bzr_repositories_root }}
 rewrite_script_log_file: {{ logs_dir }}/rewrite.log
+{{- opt("sync_branches_source", bzr_repositories_sync_branches_source) }}
 
 [error_reports]
 error_dir: {{ var_dir }}/local-oopses-codehost