Look for additional names when checking ceph-nfs container status

Ganesha cannot be operated active/active, in those deployments
where it is managed by pacemaker the container name can be
different than the default.

This change uses "ceph_nfs_service_suffix" where previously
missing to ensure tasks will work with customized names.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1750005
Signed-off-by: Giulio Fidente <gfidente@redhat.com>
pull/4438/head
Giulio Fidente 2019-09-09 19:07:02 +02:00 committed by Dimitri Savineau
parent d94229204d
commit d2a2bd7c42
3 changed files with 3 additions and 3 deletions

View File

@ -48,7 +48,7 @@
when: inventory_hostname in groups.get(rbdmirror_group_name, []) when: inventory_hostname in groups.get(rbdmirror_group_name, [])
- name: check for a nfs container - name: check for a nfs container
command: "{{ container_binary }} ps -q --filter='name=ceph-nfs-{{ ansible_hostname }}'" command: "{{ container_binary }} ps -q --filter='name=ceph-nfs-{{ ceph_nfs_service_suffix | default(ansible_hostname) }}'"
register: ceph_nfs_container_stat register: ceph_nfs_container_stat
changed_when: false changed_when: false
failed_when: false failed_when: false

View File

@ -5,7 +5,7 @@ DELAY="{{ handler_health_nfs_check_delay }}"
NFS_NAME="ceph-nfs@{{ ceph_nfs_service_suffix | default(ansible_hostname) }}" NFS_NAME="ceph-nfs@{{ ceph_nfs_service_suffix | default(ansible_hostname) }}"
PID=/var/run/ganesha.pid PID=/var/run/ganesha.pid
{% if containerized_deployment %} {% if containerized_deployment %}
DOCKER_EXEC="{{ container_binary }} exec ceph-nfs-{{ ansible_hostname }}" DOCKER_EXEC="{{ container_binary }} exec ceph-nfs-{{ ceph_nfs_service_suffix | default(ansible_hostname) }}"
{% endif %} {% endif %}
# First, restart the daemon # First, restart the daemon

View File

@ -1,7 +1,7 @@
--- ---
- name: set_fact container_exec_cmd - name: set_fact container_exec_cmd
set_fact: set_fact:
container_exec_cmd: "{{ container_binary }} exec ceph-nfs-{{ ansible_hostname }}" container_exec_cmd: "{{ container_binary }} exec ceph-nfs-{{ ceph_nfs_service_suffix | default(ansible_hostname) }}"
when: containerized_deployment | bool when: containerized_deployment | bool
- name: include pre_requisite_non_container.yml - name: include pre_requisite_non_container.yml