Merge ~lgp171188/launchpad:update-codehosting-ssh-public-port into launchpad:master

[Guruprasad]

charm: Update the bzr sftp port to 5022 and make it configurable

[Colin Watson (cjwatson)]

review: Approve

diff --git a/charm/launchpad-codehosting/config.yaml b/charm/launchpad-codehosting/config.yaml
index 540b982..466edec 100644
--- a/charm/launchpad-codehosting/config.yaml
+++ b/charm/launchpad-codehosting/config.yaml
@@ -97,6 +97,11 @@ options:
     type: int
     description: Base port number for the bzr-sftp service.
     default: 2224
+  port_lb_bzr_sftp:
+    type: int
+    description: |
+      The port on the frontend load balancer to expose the bzr-sftp service on.
+    default: 5022
   port_web_status_base:
     type: int
     description: Base port for the web status service.
diff --git a/charm/launchpad-codehosting/reactive/launchpad-codehosting.py b/charm/launchpad-codehosting/reactive/launchpad-codehosting.py
index 3176027..e057de9 100644
--- a/charm/launchpad-codehosting/reactive/launchpad-codehosting.py
+++ b/charm/launchpad-codehosting/reactive/launchpad-codehosting.py
@@ -373,7 +373,7 @@ def configure_frontend_loadbalancer():
         },
         {
             "service_name": "launchpad-codehosting-ssh",
-            "service_port": 922,
+            "service_port": config["port_lb_bzr_sftp"],
             "service_host": "0.0.0.0",
             "service_options": list(service_options_ssh),
             "servers": [