Merge ~marton-kiss/charm-openstack-service-checks:master into ~llama-charmers/charm-openstack-service-checks:master

[Márton Kiss]

Add s3_check_params to resolve LP#1881310

[Paul Goins (vultaire)]

Generally I'm +1 on this, but I'm uncertain regarding the default parameter here.

The swift_checks_param setting was added in at the same time of defining its entry in the health_check_params dict, thus it had no previous value to worry about.

On the other hand, the S3 check already uses /healthcheck, and changing to a default of / would possibly break existing deployments.

While not symmetrical with swift_check_params, I feel like the default here should be /healthcheck.

review: Needs Fixing

[Márton Kiss (marton-kiss)]

Paul, I fixed that, now it keeps the compatibility with former charms. However for deployments with ceph-radosgw for 20.05 charms +, the s3_check_params must be set to '/' in the config, otherwise the check will fail in nagios.

[Paul Goins (vultaire)]

Thanks. It's unfortunate regarding ceph-radosgw on 20.05+. Maybe this can be revisited later.

For the time being, I'm going to merge this since it should be backwards compatible and it at least gives the config options you need to set it either way.

review: Approve

diff --git a/config.yaml b/config.yaml
index edfda51..5d3302f 100644
--- a/config.yaml
+++ b/config.yaml
@@ -128,6 +128,13 @@ options:
       URL to use with check_http if there is a Swift endpoint.  Default is '/', but it's possible to add extra params,
       e.g. '/v3 -e Unauthorized -d x-openstack-request-id' or a different url, e.g. '/healthcheck'.  Mitaka Swift
       typically needs '/healthcheck'.
+  s3_check_params:
+    type: string
+    default: "/healthcheck"
+    description: |
+      URL to use with check_http if there is an S3 endpoint.  Default is '/healthcheck', but it's possible to add extra params,
+      e.g. '/v3 -e Unauthorized -d x-openstack-request-id' or a different url, e.g. '/' (when the endpoint is used with
+      ceph-radosgw for example).
   contrail_analytics_vip:
     type: string
     default: ''
diff --git a/lib/lib_openstack_service_checks.py b/lib/lib_openstack_service_checks.py
index 25607d9..47a136b 100644
--- a/lib/lib_openstack_service_checks.py
+++ b/lib/lib_openstack_service_checks.py
@@ -302,7 +302,7 @@ class OSCHelper():
             'nova': '/healthcheck',
             'octavia': '/v2 -e Unauthorized',
             'placement': '/healthcheck -e Unauthorized -d x-openstack-request-id',
-            's3': '/healthcheck',
+            's3': self.charm_config.get('s3_check_params', '/'),
             'swift': self.charm_config.get('swift_check_params', '/'),
             }