diff --git a/installNFS.yml b/installNFS.yml index 33ab1e51b91ca39be42d4b87ffe5d2e1e96279ea..1cb20573231167831844f3c96b9014f456a9571f 100644 --- a/installNFS.yml +++ b/installNFS.yml @@ -7,7 +7,6 @@ - easy-rsa-CA - easy-rsa-certificate - OpenVPN-Server - - nfs-common - nfs-server sudo: true vars: @@ -19,7 +18,6 @@ - easy-rsa-common - easy-rsa-certificate - OpenVPN-Client - - nfs-common - { role: syncExports, group_list:['openvpn-clients'], interface_list: ['eth0','tun0'] } - nfs-client sudo: true diff --git a/roles/syncExports/templates/exports.j2 b/roles/syncExports/templates/exports.j2 index ab59cf68ff309ec2044754ea43b19cf87cabef7d..1c0fd5dd7eb7774876854c63084f19de284c7817 100644 --- a/roles/syncExports/templates/exports.j2 +++ b/roles/syncExports/templates/exports.j2 @@ -1,4 +1,4 @@ {% for export in exportList %} -{{ export.src }} {% for group_name in group_list %}{% for node in groups[group_name] %}{% for interface_name in interface_list %}{{ hostvars[node]['ansible_'+interface_name]['ipv4']['address'] }}(rw,sync,root_squash) {% endfor %}{% endfor %}{% endfor %} +{{ export.src }} {% for group in groupList %}{% for node in groups[group.name] %}{% for interface_name in group.interfaces %}{{ hostvars[node]['ansible_'+interface_name]['ipv4']['address'] }}(rw,sync,root_squash) {% endfor %}{% endfor %}{% endfor %} {% endfor %} diff --git a/roles/syncExports/vars/main.yml b/roles/syncExports/vars/main.yml new file mode 100644 index 0000000000000000000000000000000000000000..cc28c3769fe202c15a6c296059f3dfd71b1846d4 --- /dev/null +++ b/roles/syncExports/vars/main.yml @@ -0,0 +1,3 @@ +--- +groupList: + - { name : 'openvpn-clients', interfaces : ['tun0'] } diff --git a/syncNFS.yml b/syncNFS.yml index 294ed1a2cd01c938a5b9e69b6ededf6cbaeaba77..be34ef3dda026b5bf54e90196a7e1f0dafa4683f 100644 --- a/syncNFS.yml +++ b/syncNFS.yml @@ -3,7 +3,7 @@ hosts: openvpn-clients remote_user: ec2-user roles: - - { role: syncExports, group_list:['openvpn-clients'], interface_list: ['eth0','tun0'] } + - syncExports - nfs-client sudo: true vars: