Sanitize Molecule code for 'nfs' role

Cleaning up of nfs mounts should only happen
on clients, not on server itself.

Explicit declaration of 'cleanup' stage playbook
not needed as it's in the default location.

Change-Id: I54e00220048f01160c15fc9631ae62586596114c
Issue-ID: OOM-1809
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>

diff --git a/ansible/roles/nfs/molecule/default/cleanup.yml b/ansible/roles/nfs/molecule/default/cleanup.yml
index a085bd5..af47ed8 100644 (file)
--- a/ansible/roles/nfs/molecule/default/cleanup.yml
+++ b/ansible/roles/nfs/molecule/default/cleanup.yml
@@ -1,6 +1,5 @@
 ---
 - name: Cleanup
-  hosts: all
-  ignore_unreachable: true
+  hosts: all:!nfs-server
   roles:
     - cleanup-nfs

diff --git a/ansible/roles/nfs/molecule/default/molecule.yml b/ansible/roles/nfs/molecule/default/molecule.yml
index f6610ec..7bacf3c 100644 (file)
--- a/ansible/roles/nfs/molecule/default/molecule.yml
+++ b/ansible/roles/nfs/molecule/default/molecule.yml
@@ -35,8 +35,6 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
 provisioner:
   name: ansible
-  playbooks:
-    cleanup: cleanup.yml
   env:
     ANSIBLE_ROLES_PATH: "../../../../test/roles"
   inventory: