From 514686fa4995021c0f6e44089ea9267041f26d72 Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Wed, 16 Sep 2015 00:45:44 +0000
Subject: [PATCH] separate making of files systes from exporting so we can
reuse make_filesystesm to attach volumes for databases
---
.../mkFilesystem.yml => make_filesystems/main.yml} | 0
roles/nfs-server/tasks/main.yml | 1 -
roles/nfs-server/tasks/startServer.yml | 6 +++---
roles/syncExports/tasks/addExports.yml | 11 ++++-------
4 files changed, 7 insertions(+), 11 deletions(-)
rename roles/{nfs-server/tasks/mkFilesystem.yml => make_filesystems/main.yml} (100%)
diff --git a/roles/nfs-server/tasks/mkFilesystem.yml b/roles/make_filesystems/main.yml
similarity index 100%
rename from roles/nfs-server/tasks/mkFilesystem.yml
rename to roles/make_filesystems/main.yml
diff --git a/roles/nfs-server/tasks/main.yml b/roles/nfs-server/tasks/main.yml
index 9ba0c9fb..bde79430 100644
--- a/roles/nfs-server/tasks/main.yml
+++ b/roles/nfs-server/tasks/main.yml
@@ -4,5 +4,4 @@
sudo: true
when: ansible_os_family == "Debian"
-- include: mkFilesystem.yml
- include: startServer.yml
diff --git a/roles/nfs-server/tasks/startServer.yml b/roles/nfs-server/tasks/startServer.yml
index 606b143b..c2f74a2f 100644
--- a/roles/nfs-server/tasks/startServer.yml
+++ b/roles/nfs-server/tasks/startServer.yml
@@ -1,15 +1,15 @@
---
- name: "Starting rpcbind"
- service: "name=rpcbind state=restarted"
+ service: "name=rpcbind state=started"
sudo: true
when: ansible_os_family == "RedHat"
- name: "Start the Server"
- service: "name=nfs state=restarted"
+ service: "name=nfs state=started"
sudo: true
when: ansible_os_family == "RedHat"
- name: "Start the Server"
- service: "name=nfs-kernel-server state=restarted"
+ service: "name=nfs-kernel-server state=started"
sudo: true
when: ansible_os_family == "Debian"
diff --git a/roles/syncExports/tasks/addExports.yml b/roles/syncExports/tasks/addExports.yml
index b59b9052..6edbd85a 100644
--- a/roles/syncExports/tasks/addExports.yml
+++ b/roles/syncExports/tasks/addExports.yml
@@ -1,24 +1,21 @@
---
-- name: "Create exports if necessary"
- file: dest={{ item.src }} state=directory mode=755 owner=root group=root
- sudo: true
- with_items: exportList
-
- name: "Templating /etc/exports"
copy: src=files/etcExports dest=/etc/exports owner=root group=root mode=644
sudo: true
+ register: exports
- name: "Start the Server"
service: "name=nfs state=restarted"
sudo: true
- when: ansible_os_family == "RedHat"
+ when: ansible_os_family == "RedHat" and exports.changed
- name: "Start the Server"
service: "name=nfs-kernel-server state=restarted"
sudo: true
- when: ansible_os_family == "Debian"
+ when: ansible_os_family == "Debian" and exports.changed
- name : "Pause ... clients sometimes have errors"
command: sleep 60
notify: "Reload exports"
+ when: exports.changed
--
GitLab