launchpad-reviewers team mailing list archive

[Colin Watson <mp+448421@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/turnip:charm-fix-haproxy-service-options into turnip:master.

Commit message:
charm: Add type/description to overridden haproxy_service_options

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/448421

Copied from `charm/layer/turnip-base/config.yaml`.  `charmcraft` seems to be a bit pickier about this nowadays and is failing if we try to override just the default values.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/turnip:charm-fix-haproxy-service-options into turnip:master.

diff --git a/charm/turnip-api/config.yaml b/charm/turnip-api/config.yaml
index cff36b9..ae5153b 100644
--- a/charm/turnip-api/config.yaml
+++ b/charm/turnip-api/config.yaml
@@ -40,11 +40,13 @@ options:
       The granularity of error log entries (valid values are debug, info,
       warning, error, and critical).
   haproxy_service_options:
+    type: string
     default: |
       - mode http
       - option httplog
       - option httpchk /repo
       - balance leastconn
+    description: HAProxy service options.
   celery_broker:
     type: string
     default: pyamqp://guest@localhost//
diff --git a/charm/turnip-pack-frontend-http/config.yaml b/charm/turnip-pack-frontend-http/config.yaml
index c7ece19..243ba9a 100644
--- a/charm/turnip-pack-frontend-http/config.yaml
+++ b/charm/turnip-pack-frontend-http/config.yaml
@@ -54,8 +54,10 @@ options:
       A list of repository URLs to run end-to-end checks on. Multiple
       entries should be separated by spaces.
   haproxy_service_options:
+    type: string
     default: |
       - mode http
       - option httplog
       - option httpchk
       - balance leastconn
+    description: HAProxy service options.