From b1fa3c881cf9f1c797083a95d9eb99493b887d8b 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 3f6cde270..431857623 100644 --- a/roles/ceph-nfs/tasks/main.yml +++ b/roles/ceph-nfs/tasks/main.yml @@ -8,6 +8,14 @@ - name: include common.yml include_tasks: common.yml +# 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: diff --git a/roles/ceph-nfs/tasks/pre_requisite_non_container.yml b/roles/ceph-nfs/tasks/pre_requisite_non_container.yml index bfe71448c..636c59b72 100644 --- a/roles/ceph-nfs/tasks/pre_requisite_non_container.yml +++ b/roles/ceph-nfs/tasks/pre_requisite_non_container.yml @@ -231,10 +231,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