ansible/node: Conditionally use tarball install in "ctdb" role

This also sets up a ctdb_config_dir fact that can also be used in the
"nas" role.

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

diff --git a/ansible/node/roles/ctdb/tasks/generic/ctdb_nodes.yml b/ansible/node/roles/ctdb/tasks/generic/ctdb_nodes.yml
index 350aeeb9cee74816eae66cc7ff574117e1ae9072..2859ac926adfa171b46edbb8938af2dcc3467ba8 100644 (file)
--- a/ansible/node/roles/ctdb/tasks/generic/ctdb_nodes.yml
+++ b/ansible/node/roles/ctdb/tasks/generic/ctdb_nodes.yml
@@ -1,5 +1,12 @@
 ---
+- name: determine CTDB nodes file location
+  vars:
+    tdir: "{{ tarball_install_prefix }}/etc/ctdb"
+    pdir: /etc/ctdb
+  set_fact:
+    ctdb_config_dir: "{{ tdir if tarball is not none else pdir }}"
+
 - name: generate CTDB nodes file
   template:
     src: ctdb_nodes.j2
-    dest: /etc/ctdb/nodes
+    dest: "{{ ctdb_config_dir }}/nodes"

diff --git a/ansible/node/roles/ctdb/tasks/main.yml b/ansible/node/roles/ctdb/tasks/main.yml
index 2af86384ffd70ed2174ae97770d0593e189376c9..a7a6d7d232a8b6a4e27b0c0dd4ac8d47d2744863 100644 (file)
--- a/ansible/node/roles/ctdb/tasks/main.yml
+++ b/ansible/node/roles/ctdb/tasks/main.yml
@@ -2,6 +2,19 @@
 - include_tasks: "{{ ansible_os_family | lower }}/{{ task }}.yml"
   with_list:
   - install_ctdb
+  loop_control:
+    loop_var: task
+  when: tarball is none
+
+- include_role:
+    name: tarball_common
+    tasks_from: install_ctdb.yml
+  vars:
+    source_tarball: "{{ tarball }}"
+  when: tarball is not none
+
+- include_tasks: "{{ ansible_os_family | lower }}/{{ task }}.yml"
+  with_list:
   - install_support
   loop_control:
     loop_var: task