summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2019-04-17 13:32:37 +0200
committerBartek Grzybowski <b.grzybowski@partner.samsung.com>2019-04-17 13:32:37 +0200
commit96a4bafa0f159f14bcbe6743b1a98ea76e7bef21 (patch)
treea7eb19389f079dbf6d9d4944d1f43c2be35a0d5c
parent45fa0030abb4c013722f68c1ef23d53ba1d1620e (diff)
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>
-rw-r--r--ansible/roles/nfs/molecule/default/cleanup.yml3
-rw-r--r--ansible/roles/nfs/molecule/default/molecule.yml2
2 files changed, 1 insertions, 4 deletions
diff --git a/ansible/roles/nfs/molecule/default/cleanup.yml b/ansible/roles/nfs/molecule/default/cleanup.yml
index a085bd5a..af47ed82 100644
--- 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 f6610ece..7bacf3c4 100644
--- 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: