ansible/node: Restructure "nas" role

Give tasks clearer names and split out installation of Samba packages.
There's also some redundant indirection that will allow easy addition
of authselect in future.

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/ansible/node/roles/nas/tasks/generic/samba.yml b/ansible/node/roles/nas/tasks/generic/configure_samba.yml
similarity index 55%
rename from ansible/node/roles/nas/tasks/generic/samba.yml
rename to ansible/node/roles/nas/tasks/generic/configure_samba.yml
index c1e58b8943e55e566e0d7e30b245c5665d455fe3..629cd467e371271ae1ed16a39b353dc101b38e3a 100644 (file)
--- a/ansible/node/roles/nas/tasks/generic/samba.yml
+++ b/ansible/node/roles/nas/tasks/generic/configure_samba.yml
@@ -4,7 +4,5 @@
     src: smb.conf
     dest: /etc/samba/smb.conf
 
-# TODO: Enable 50.samba and 60.nfs event scripts
-
-- import_tasks: samba-once.yml
+- import_tasks: configure_samba_registry.yml
   run_once: true

diff --git a/ansible/node/roles/nas/tasks/generic/samba-once.yml b/ansible/node/roles/nas/tasks/generic/configure_samba_registry.yml
similarity index 100%
rename from ansible/node/roles/nas/tasks/generic/samba-once.yml
rename to ansible/node/roles/nas/tasks/generic/configure_samba_registry.yml

diff --git a/ansible/node/roles/nas/tasks/main.yml b/ansible/node/roles/nas/tasks/main.yml
index 6d56084a3702e757e1c240f936588a2a8525080e..a8fa9504b5a197cc5b1dac91c1bc62250768ecbe 100644 (file)
--- a/ansible/node/roles/nas/tasks/main.yml
+++ b/ansible/node/roles/nas/tasks/main.yml
@@ -1,16 +1,17 @@
 ---
 - include_tasks: "{{ ansible_os_family | lower }}/{{ task }}.yml"
-  with_list:
-  - samba
+  loop:
+  - install_samba
+  - setup_samba_auth
   - nfs
   loop_control:
     loop_var: task
 
 - include_tasks: generic/{{ task }}.yml
-  with_list:
+  loop:
   - shares
   - ctdb
-  - samba
+  - configure_samba
   - nfs
   - ctdb-with-samba-nfs
   loop_control:

diff --git a/ansible/node/roles/nas/tasks/redhat/install_samba.yml b/ansible/node/roles/nas/tasks/redhat/install_samba.yml
new file mode 100644 (file)
index 0000000..7343c88
--- /dev/null
+++ b/ansible/node/roles/nas/tasks/redhat/install_samba.yml
@@ -0,0 +1,29 @@
+---
+
+- name: install Samba packages
+  package:
+    name:
+    - tdb-tools
+    - samba
+    - samba-client
+    - samba-doc
+    - samba-winbind
+    - samba-winbind-clients
+    state: present
+
+- name: install Samba packages for GPFS
+  package:
+    name: samba-vfs-gpfs
+    state: present
+  when: clusterfs.type == 'gpfs'
+
+- name: ensure Samba does not autostart
+  service:
+    name: "{{ service }}"
+    enabled: no
+  with_list:
+    - smb
+    - nmb
+    - winbind
+  loop_control:
+    loop_var: service

diff --git a/ansible/node/roles/nas/tasks/redhat/samba.yml b/ansible/node/roles/nas/tasks/redhat/samba_authconfig.yml
similarity index 54%
rename from ansible/node/roles/nas/tasks/redhat/samba.yml
rename to ansible/node/roles/nas/tasks/redhat/samba_authconfig.yml
index ebcd7fb109155473a22a34875949f614043a1419..fb89851af3fd953ca88ac091ccfc856731ac53fb 100644 (file)
--- a/ansible/node/roles/nas/tasks/redhat/samba.yml
+++ b/ansible/node/roles/nas/tasks/redhat/samba_authconfig.yml
@@ -1,33 +1,5 @@
 ---
 
-- name: install Samba packages
-  package:
-    name:
-    - tdb-tools
-    - samba
-    - samba-client
-    - samba-doc
-    - samba-winbind
-    - samba-winbind-clients
-    state: present
-
-- name: install Samba packages for GPFS
-  package:
-    name: samba-vfs-gpfs
-    state: present
-  when: clusterfs.type == 'gpfs'
-
-- name: ensure Samba does not autostart
-  service:
-    name: "{{ service }}"
-    enabled: no
-  with_list:
-    - smb
-    - nmb
-    - winbind
-  loop_control:
-    loop_var: service
-
 - name: Set up NSS, PAM, ...
   command: >
     authconfig --update --nostart

diff --git a/ansible/node/roles/nas/tasks/redhat/setup_samba_auth.yml b/ansible/node/roles/nas/tasks/redhat/setup_samba_auth.yml
new file mode 100644 (file)
index 0000000..4958ea4
--- /dev/null
+++ b/ansible/node/roles/nas/tasks/redhat/setup_samba_auth.yml
@@ -0,0 +1,3 @@
+---
+
+- include_tasks: samba_authconfig.yml