From: Sébastien Han <seb@redhat.com>
Date: Tue, 24 Jul 2018 16:27:12 +0000 (+0200)
Subject: rgw: add more config option for civetweb frontend
X-Git-Tag: v3.1.0rc11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=154b1dcc74ba109bd75850a67a97e6ce283cfb04;p=ceph-ansible.git

rgw: add more config option for civetweb frontend

In containerized deployments we now inherite from the
radosgw_civetweb_options options when bootstrapping the container.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1582411
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit e2ea5bac5111c7633640b66f2570dc83893bae7a)
---

diff --git a/roles/ceph-rgw/tasks/docker/container_env_facts.yml b/roles/ceph-rgw/tasks/docker/container_env_facts.yml
index 1d4637302..344267d7e 100644
--- a/roles/ceph-rgw/tasks/docker/container_env_facts.yml
+++ b/roles/ceph-rgw/tasks/docker/container_env_facts.yml
@@ -1,12 +1,16 @@
 ---
+- name: set_fact docker_env_args '-e RGW_FRONTENDS={{ radosgw_civetweb_options }}'
+  set_fact:
+    docker_env_args: -e RGW_FRONTENDS={{ radosgw_civetweb_options }}
+
 - name: set_fact docker_env_args '-e RGW_ZONEGROUP={{ rgw_zonegroup }}'
   set_fact:
-    docker_env_args: -e RGW_ZONEGROUP={{ rgw_zonegroup }}
+    docker_env_args: "{{ docker_env_args }} -e RGW_ZONEGROUP={{ rgw_zonegroup }}"
   when:
     - rgw_zonegroup != ""
 
 - name: set_fact docker_env_args '-e RGW_ZONE={{ rgw_zone }}'
   set_fact:
-    docker_env_args: "{{ docker_env_args | default ('') }} -e RGW_ZONE={{ rgw_zone }}"
+    docker_env_args: "{{ docker_env_args }} -e RGW_ZONE={{ rgw_zone }}"
   when:
     - rgw_zone != ""
\ No newline at end of file