launchpad-reviewers team mailing list archive

[Guruprasad <mp+454744@xxxxxxxxxxxxxxxxxx>]

Guruprasad has proposed merging ~lgp171188/launchpad:charm-codehosting-simplify-cert-configuration into launchpad:master.

Commit message:
charm/launchpad-codehosting: Simplify TLS certification configuration

We do not need any value other than 'DEFAULT' `crts` list passed to the load balancer.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad/+git/launchpad/+merge/454744
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad:charm-codehosting-simplify-cert-configuration into launchpad:master.

diff --git a/charm/launchpad-codehosting/config.yaml b/charm/launchpad-codehosting/config.yaml
index 466edec..11e39a8 100644
--- a/charm/launchpad-codehosting/config.yaml
+++ b/charm/launchpad-codehosting/config.yaml
@@ -32,12 +32,6 @@ options:
     type: string
     description: Options to add to the HAProxy http(s) "server" lines.
     default: check inter 2000 rise 2 fall 5 maxconn 16
-  haproxy_service_https_cert_type:
-    type: string
-    description: |
-      The type of certificate to use for the https service. Either "DEFAULT"
-      or "EXTERNAL".
-    default: "DEFAULT"
   haproxy_service_options_internal_branch_by_id:
     type: string
     description: |
diff --git a/charm/launchpad-codehosting/reactive/launchpad-codehosting.py b/charm/launchpad-codehosting/reactive/launchpad-codehosting.py
index e057de9..d0aeec6 100644
--- a/charm/launchpad-codehosting/reactive/launchpad-codehosting.py
+++ b/charm/launchpad-codehosting/reactive/launchpad-codehosting.py
@@ -369,7 +369,7 @@ def configure_frontend_loadbalancer():
                     server_options,
                 ],
             ],
-            "crts": [config["haproxy_service_https_cert_type"]],
+            "crts": ["DEFAULT"],
         },
         {
             "service_name": "launchpad-codehosting-ssh",