ansible/node: Restructure "ctdb" role

Give tasks clearer names and split out installation of the CTDB
package and supporting package(s).

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

diff --git a/ansible/node/roles/ctdb/tasks/generic/ctdb.yml b/ansible/node/roles/ctdb/tasks/generic/ctdb_nodes.yml
similarity index 100%
rename from ansible/node/roles/ctdb/tasks/generic/ctdb.yml
rename to ansible/node/roles/ctdb/tasks/generic/ctdb_nodes.yml

diff --git a/ansible/node/roles/ctdb/tasks/main.yml b/ansible/node/roles/ctdb/tasks/main.yml
index 525944800c0208c30931cb83c85635bbc21afffe..2af86384ffd70ed2174ae97770d0593e189376c9 100644 (file)
--- a/ansible/node/roles/ctdb/tasks/main.yml
+++ b/ansible/node/roles/ctdb/tasks/main.yml
@@ -1,12 +1,13 @@
 ---
 - include_tasks: "{{ ansible_os_family | lower }}/{{ task }}.yml"
   with_list:
-  - packages
+  - install_ctdb
+  - install_support
   loop_control:
     loop_var: task
 
 - include_tasks: generic/{{ task }}.yml
   with_list:
-  - ctdb
+  - ctdb_nodes
   loop_control:
     loop_var: task

diff --git a/ansible/node/roles/ctdb/tasks/redhat/packages.yml b/ansible/node/roles/ctdb/tasks/redhat/install_ctdb.yml
similarity index 100%
rename from ansible/node/roles/ctdb/tasks/redhat/packages.yml
rename to ansible/node/roles/ctdb/tasks/redhat/install_ctdb.yml

diff --git a/ansible/node/roles/ctdb/tasks/redhat/install_support.yml b/ansible/node/roles/ctdb/tasks/redhat/install_support.yml
new file mode 100644 (file)
index 0000000..70a059d
--- /dev/null
+++ b/ansible/node/roles/ctdb/tasks/redhat/install_support.yml
@@ -0,0 +1,5 @@
+---
+- name: install tcpdump
+  package:
+    name: tcpdump
+    state: present