From d85dec1bbc3ba15b0a0dcb718d7ca36a2307e5a2 Mon Sep 17 00:00:00 2001
From: shahaan <shahaan@gmail.com>
Date: Tue, 9 Dec 2014 12:50:38 +1100
Subject: [PATCH] Feature requests for syncExports, enabling a list in vars
section
---
installNFS.yml | 2 --
roles/syncExports/templates/exports.j2 | 2 +-
roles/syncExports/vars/main.yml | 3 +++
syncNFS.yml | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
create mode 100644 roles/syncExports/vars/main.yml
diff --git a/installNFS.yml b/installNFS.yml
index 33ab1e5..1cb2057 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 ab59cf6..1c0fd5d 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 0000000..cc28c37
--- /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 294ed1a..be34ef3 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:
--
GitLab