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

radosgw: remove INST_PORT environment variable 

This variable isn't consumed by the container so we can remove it.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 1361e84a4e)
pull/5580/head
Dimitri Savineau 2020-07-02 10:47:45 -04:00 committed by Guillaume Abrioux
parent 518f4f579d
commit 3c3a232b77
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/ceph-config/tasks/rgw_systemd_environment_file.yml
View File

@ -16,7 +16,6 @@
mode: "0644"
content: |
INST_NAME={{ item.instance_name }}
INST_PORT={{ item.radosgw_frontend_port }}
with_items: "{{ rgw_instances }}"
when:
- containerized_deployment | bool

1
roles/ceph-rgw/templates/ceph-radosgw.service.j2
View File

@ -46,7 +46,6 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \
-e CEPH_DAEMON=RGW \
-e CLUSTER={{ cluster }} \
-e RGW_NAME={{ ansible_hostname }}.${INST_NAME} \
-e RGW_CIVETWEB_PORT=${INST_PORT} \
-e CONTAINER_IMAGE={{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} \
--name=ceph-rgw-{{ ansible_hostname }}-${INST_NAME} \
{{ ceph_rgw_docker_extra_env }} \