diff options
| author |   Michal Zegan <m.zegan@samsung.com> | 2019-04-09 15:21:52 +0200 |
|---|---|---|
| committer |   Samuli Silvius <s.silvius@partner.samsung.com> | 2019-04-17 08:18:00 +0000 |
| commit | 1266d180911300c4236a6e1411b1f1782884dafb (patch) | |
| tree | 90488bd4aa1bde844a1d14a74bf817bd9591734b /ansible/roles/nfs/molecule/default/tests | |
| parent | bb3bef83ca562b9aadc288b3ec46264d73ec73ac (diff) | |
Improve nfs role
This commit improves the nfs role by
using cluster_ip variable instead of ansible_host for getting
nfs client/server address, and
using /etc/exports.d instead of /etc/exports for
exporting nfs filesystem.
Also, this commit fixes other
issues in molecule found along the way.
Change-Id: Ibd4ea5d4fd937116e2dc9e1b6f85c3e019f62e17
Issue-ID: OOM-1770
Signed-off-by: Michal Zegan <m.zegan@samsung.com>
Diffstat (limited to 'ansible/roles/nfs/molecule/default/tests')
| -rw-r--r-- | ansible/roles/nfs/molecule/default/tests/test_kubernetes-server.py | 9 | ||||
| -rw-r--r-- | ansible/roles/nfs/molecule/default/tests/test_nfs-server.py | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/ansible/roles/nfs/molecule/default/tests/test_kubernetes-server.py b/ansible/roles/nfs/molecule/default/tests/test_kubernetes-server.py index b702a73d..0e3710cf 100644 --- a/ansible/roles/nfs/molecule/default/tests/test_kubernetes-server.py +++ b/ansible/roles/nfs/molecule/default/tests/test_kubernetes-server.py @@ -1,5 +1,6 @@ import os +import testinfra import testinfra.utils.ansible_runner testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( @@ -7,9 +8,11 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def test_nfs_mount(host): + node1_ip = testinfra.get_host("docker://kubernetes-node-1").interface( + "eth0").addresses[0] mp = host.mount_point("/dockerdata-nfs") assert mp.exists - assert mp.filesystem == "nfs" - assert mp.device == "kubernetes-node-1:/dockerdata-nfs" + assert mp.filesystem == "nfs" or mp.filesystem == "nfs4" + assert mp.device == node1_ip + ":/dockerdata-nfs" assert host.file("/etc/fstab").\ - contains("kubernetes-node-1:/dockerdata-nfs /dockerdata-nfs nfs") + contains(node1_ip + ":/dockerdata-nfs /dockerdata-nfs nfs") diff --git a/ansible/roles/nfs/molecule/default/tests/test_nfs-server.py b/ansible/roles/nfs/molecule/default/tests/test_nfs-server.py index 078c653e..88ba0a61 100644 --- a/ansible/roles/nfs/molecule/default/tests/test_nfs-server.py +++ b/ansible/roles/nfs/molecule/default/tests/test_nfs-server.py @@ -1,6 +1,7 @@ import os import pytest +import testinfra import testinfra.utils.ansible_runner testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( @@ -19,7 +20,9 @@ def test_svc(host, svc): def test_exports(host): - f = host.file("/etc/exports") + node2_ip = testinfra.get_host("docker://kubernetes-node-2").interface( + "eth0").addresses[0] + f = host.file("/etc/exports.d/dockerdata-nfs.exports") assert f.exists assert f.content_string == \ - """/dockerdata-nfs kubernetes-node-2(rw,sync,no_root_squash,no_subtree_check)""" # noqa: E501 + """/dockerdata-nfs """ + node2_ip + """(rw,sync,no_root_squash,no_subtree_check)""" # noqa: E501 |