From 1d4d49695ef2aace73affadd380a8245199353d0 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 7 Oct 2019 10:34:07 +0200 Subject: [PATCH] nfs: stop nfs server service in all context This commit moves this task in order to stop the nfs server service regardless the deployment type desired (containerized or non containerized). Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1508506 Signed-off-by: Guillaume Abrioux (cherry picked from commit 6c6a512a720de0268e2d099926413e2816c65174) --- roles/ceph-nfs/tasks/main.yml | 8 ++++++++ roles/ceph-nfs/tasks/pre_requisite_non_container.yml | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/roles/ceph-nfs/tasks/main.yml b/roles/ceph-nfs/tasks/main.yml index 273889361..f67703293 100644 --- a/roles/ceph-nfs/tasks/main.yml +++ b/roles/ceph-nfs/tasks/main.yml @@ -4,6 +4,14 @@ container_exec_cmd: "{{ container_binary }} exec ceph-nfs-{{ ceph_nfs_service_suffix | default(ansible_hostname) }}" when: containerized_deployment | bool +# global/common requirement +- name: stop nfs server service + systemd: + name: "{{ 'nfs-server' if ansible_os_family == 'RedHat' else 'nfsserver' if ansible_os_family == 'Suse' else 'nfs-kernel-server' if ansible_os_family == 'Debian' }}" + state: stopped + enabled: no + failed_when: false + - name: include pre_requisite_non_container.yml include_tasks: pre_requisite_non_container.yml when: not containerized_deployment | bool diff --git a/roles/ceph-nfs/tasks/pre_requisite_non_container.yml b/roles/ceph-nfs/tasks/pre_requisite_non_container.yml index 0af7e9bf2..0c497f6a9 100644 --- a/roles/ceph-nfs/tasks/pre_requisite_non_container.yml +++ b/roles/ceph-nfs/tasks/pre_requisite_non_container.yml @@ -92,10 +92,3 @@ owner: "root" group: "root" mode: "0755" - -- name: stop nfs server service - systemd: - name: "{{ 'nfs-server' if ansible_os_family == 'RedHat' else 'nfsserver' if ansible_os_family == 'Suse' else 'nfs-kernel-server' if ansible_os_family == 'Debian' }}" - state: stopped - enabled: no - failed_when: false -- 2.39.5