ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 e2ea5bac51)
pull/2943/head v3.1.0rc11
Sébastien Han 2018-07-24 18:27:12 +02:00 committed by mergify[bot]
parent 9184b794dd
commit 154b1dcc74
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
roles/ceph-rgw/tasks/docker/container_env_facts.yml
View File

@ -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 }}' - name: set_fact docker_env_args '-e RGW_ZONEGROUP={{ rgw_zonegroup }}'
set_fact: set_fact:
docker_env_args: -e RGW_ZONEGROUP={{ rgw_zonegroup }} docker_env_args: "{{ docker_env_args }} -e RGW_ZONEGROUP={{ rgw_zonegroup }}"
when: when:
- rgw_zonegroup != "" - rgw_zonegroup != ""
- name: set_fact docker_env_args '-e RGW_ZONE={{ rgw_zone }}' - name: set_fact docker_env_args '-e RGW_ZONE={{ rgw_zone }}'
set_fact: 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: when:
- rgw_zone != "" - rgw_zone != ""