Add 'debops.nfs_server' role, reorder NFS plays

debops · Apr 6, 2017 · 12a35e7 · 12a35e7
1 parent 0377416
commit 12a35e7
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 5 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -83,6 +83,9 @@ Added
 
 - Add ``flattened`` Jinja filter to debops__tpl_macros.js_. [ypid_]
 
+- Add the ``debops.nfs_server`` Ansible role with a corresponding playbook.
+  [drybjed_]
+
 Changed
 ~~~~~~~
 
@@ -147,6 +150,9 @@ Changed
 
 - Update the debops.gitlab_ playbook to use role dependencies. [drybjed_]
 
+- The order of the NFS server/client roles has been moved to be earlier in the
+  main playbook to allow for mounting of the NFS shares early. [drybjed_]
+
 Deprecated
 ~~~~~~~~~~
 

diff --git a/galaxy/requirements-testing.txt b/galaxy/requirements-testing.txt
@@ -62,6 +62,7 @@ debops.monkeysphere,testing
 debops.mysql,testing
 debops.netbox,testing
 debops.nfs,testing
+debops.nfs_server,testing
 debops.nginx,testing
 debops.nodejs,testing
 debops.ntp,testing

diff --git a/galaxy/requirements-testing.yml b/galaxy/requirements-testing.yml
@@ -190,6 +190,9 @@
 - src: debops.nfs
   version: testing
 
+- src: debops.nfs_server
+  version: testing
+
 - src: debops.nginx
   version: testing
 

diff --git a/galaxy/requirements.txt b/galaxy/requirements.txt
@@ -62,6 +62,7 @@ debops.monkeysphere
 debops.mysql
 debops.netbox
 debops.nfs
+debops.nfs_server
 debops.nginx
 debops.nodejs
 debops.ntp

diff --git a/galaxy/requirements.yml b/galaxy/requirements.yml
@@ -126,6 +126,8 @@
 
 - src: debops.nfs
 
+- src: debops.nfs_server
+
 - src: debops.nginx
 
 - src: debops.nodejs

diff --git a/playbooks/service/nfs.yml b/playbooks/service/nfs.yml
@@ -1,7 +1,7 @@
 ---
 
-- name: Manage NFS service
-  hosts: [ 'debops_service_nfs', 'debops_nfs' ]
+- name: Manage NFS shares
+  hosts: [ 'debops_service_nfs' ]
   become: True
 
   environment: '{{ inventory__environment | d({})
@@ -12,4 +12,3 @@
 
     - role: debops.nfs
       tags: [ 'role::nfs' ]
-
diff --git a/playbooks/service/nfs_server.yml b/playbooks/service/nfs_server.yml
@@ -0,0 +1,29 @@
+---
+
+- name: Configure NFS Server
+  hosts: [ 'debops_service_nfs_server' ]
+  become: True
+
+  environment: '{{ inventory__environment | d({})
+                   | combine(inventory__group_environment | d({}))
+                   | combine(inventory__host_environment  | d({})) }}'
+
+  roles:
+
+    - role: debops.etc_services
+      tags: [ 'role::etc_services', 'role::ferm' ]
+      etc_services__dependent_list:
+        - '{{ nfs_server__etc_services__dependent_list }}'
+
+    - role: debops.ferm
+      tags: [ 'role::ferm' ]
+      ferm__dependent_rules:
+        - '{{ nfs_server__ferm__dependent_rules }}'
+
+    - role: debops.tcpwrappers
+      tags: [ 'role::tcpwrappers' ]
+      tcpwrappers__dependent_allow:
+        - '{{ nfs_server__tcpwrappers__dependent_allow }}'
+
+    - role: debops.nfs_server
+      tags: [ 'role::nfs_server' ]
diff --git a/playbooks/sys/all.yml b/playbooks/sys/all.yml
@@ -2,6 +2,10 @@
 
 - include: swapfile.yml
 
+- include: nfs_server.yml
+
+- include: nfs.yml
+
 - include: gitusers.yml
 
 - include: sftpusers.yml
@@ -14,6 +18,4 @@
 
 - include: cryptsetup.yml
 
-- include: nfs.yml
-
 - include: persistent_paths.yml
diff --git a/playbooks/sys/nfs_server.yml b/playbooks/sys/nfs_server.yml
@@ -0,0 +1 @@
+../service/nfs_server.yml