From: François Lafont Date: Sat, 6 Apr 2019 09:44:03 +0000 (+0200) Subject: ceph-rgw: Fix bad paths which depend on the clustername X-Git-Tag: v4.0.0rc4~56 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=af78673328309cd9c85499d7734fa6b41b252e1a;p=ceph-ansible.git ceph-rgw: Fix bad paths which depend on the clustername The path of the RGW environment file (in the /var/lib/ceph/radosgw/ directory) depends on the Ceph clustername. It was not taken into account in the Ansible role `ceph-rgw`. Signed-off-by: flaf (cherry picked from commit 4c3e77d8690a7be4fb89f7292c51f8644faaeafa) --- diff --git a/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml b/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml index 924c8c009..e48d0b906 100644 --- a/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml +++ b/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml @@ -2,7 +2,7 @@ - name: generate environment file become: true copy: - dest: "/var/lib/ceph/radosgw/ceph-rgw.{{ ansible_hostname }}.{{ item.instance_name }}/EnvironmentFile" + dest: "/var/lib/ceph/radosgw/{{ cluster }}-rgw.{{ ansible_hostname }}.{{ item.instance_name }}/EnvironmentFile" owner: "root" group: "root" mode: "0644" diff --git a/roles/ceph-rgw/templates/ceph-radosgw.service.j2 b/roles/ceph-rgw/templates/ceph-radosgw.service.j2 index 4368da9d2..a5ac94973 100644 --- a/roles/ceph-rgw/templates/ceph-radosgw.service.j2 +++ b/roles/ceph-rgw/templates/ceph-radosgw.service.j2 @@ -6,7 +6,7 @@ After=docker.service {% set cpu_limit = ansible_processor_vcpus|int if ceph_rgw_docker_cpu_limit|int > ansible_processor_vcpus|int else ceph_rgw_docker_cpu_limit|int %} [Service] -EnvironmentFile=/var/lib/ceph/radosgw/ceph-%i/EnvironmentFile +EnvironmentFile=/var/lib/ceph/radosgw/{{ cluster }}-%i/EnvironmentFile ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-rgw-{{ ansible_hostname }}-${INST_NAME} ExecStartPre=-/usr/bin/{{ container_binary }} rm ceph-rgw-{{ ansible_hostname }}-${INST_NAME} ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \