From f06ce04044d81ba5d804c0b371c6697f4cb0bf62 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Tue, 24 Jul 2018 18:27:12 +0200 Subject: [PATCH] rgw: add more config option for civetweb frontend MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit e2ea5bac5111c7633640b66f2570dc83893bae7a) --- roles/ceph-rgw/tasks/docker/container_env_facts.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 -- 2.39.5