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

This uses the ctdb_config_dir fact from the "ctdb" role.

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

diff --git a/ansible/node/roles/nas/tasks/generic/configure_samba.yml b/ansible/node/roles/nas/tasks/generic/configure_samba.yml
index 629cd467e371271ae1ed16a39b353dc101b38e3a..5316a2dd01d50baef27923de67e5ef958d7980db 100644 (file)
--- a/ansible/node/roles/nas/tasks/generic/configure_samba.yml
+++ b/ansible/node/roles/nas/tasks/generic/configure_samba.yml
@@ -1,8 +1,12 @@
 ---
 - name: add smb.conf
+  vars:
+    tdir: "{{ tarball_install_prefix }}/etc"
+    pdir: /etc/samba
+    samba_config_dir: "{{ tdir if tarball is not none else pdir }}"
   copy:
     src: smb.conf
-    dest: /etc/samba/smb.conf
+    dest: "{{ samba_config_dir }}/smb.conf"
 
 - import_tasks: configure_samba_registry.yml
   run_once: true

diff --git a/ansible/node/roles/nas/tasks/generic/ctdb.yml b/ansible/node/roles/nas/tasks/generic/ctdb.yml
index 5041db46f39c992e7d4c7a7601f91d76a294b945..0271d2a11cff0e9359e115f20c5e641e3279c3ea 100644 (file)
--- a/ansible/node/roles/nas/tasks/generic/ctdb.yml
+++ b/ansible/node/roles/nas/tasks/generic/ctdb.yml
@@ -2,12 +2,12 @@
 - name: generate CTDB configuration file
   template:
     src: ctdb_conf.j2
-    dest: /etc/ctdb/ctdb.conf
+    dest: "{{ ctdb_config_dir }}/ctdb.conf"
 
 - name: generate CTDB public addresses file
   template:
     src: ctdb_public_addresses.j2
-    dest: /etc/ctdb/public_addresses
+    dest: "{{ ctdb_config_dir }}/public_addresses"
 
 - name: create directory for CTDB recovery lock
   file:

diff --git a/ansible/node/roles/nas/tasks/main.yml b/ansible/node/roles/nas/tasks/main.yml
index a8fa9504b5a197cc5b1dac91c1bc62250768ecbe..0c444bd77c0a883b1c608fcd6398592be8e962de 100644 (file)
--- a/ansible/node/roles/nas/tasks/main.yml
+++ b/ansible/node/roles/nas/tasks/main.yml
@@ -2,6 +2,19 @@
 - include_tasks: "{{ ansible_os_family | lower }}/{{ task }}.yml"
   loop:
   - install_samba
+  loop_control:
+    loop_var: task
+  when: tarball is none
+
+- include_role:
+    name: tarball_common
+    tasks_from: install_samba.yml
+  vars:
+    source_tarball: "{{ tarball }}"
+  when: tarball is not none
+
+- include_tasks: "{{ ansible_os_family | lower }}/{{ task }}.yml"
+  loop:
   - setup_samba_auth
   - nfs
   loop_control:

diff --git a/ansible/node/roles/nas/templates/ctdb_sysconfig.j2 b/ansible/node/roles/nas/templates/ctdb_sysconfig.j2
index 9992023931f70c8c9328bc9ad70585706e1daa4e..9d90fc3740418f446cdbaddd9d61061e4c293495 100644 (file)
--- a/ansible/node/roles/nas/templates/ctdb_sysconfig.j2
+++ b/ansible/node/roles/nas/templates/ctdb_sysconfig.j2
@@ -1,5 +1,5 @@
 # Core
-CTDB_PUBLIC_ADDRESSES=/etc/ctdb/public_addresses
+CTDB_PUBLIC_ADDRESSES={{ ctdb_config_dir }}/public_addresses
 CTDB_RECOVERY_LOCK={{ clusterfs.mountpoint }}/.ctdb/recovery.lock
 
 # Services managed

diff --git a/ansible/node/roles/nas/templates/nfs_sysconfig.j2 b/ansible/node/roles/nas/templates/nfs_sysconfig.j2
index 5069c2460f54ec8d42a236f500859f79094c7974..d52499396b16584610c8c5b2ebe83759a7873fe1 100644 (file)
--- a/ansible/node/roles/nas/templates/nfs_sysconfig.j2
+++ b/ansible/node/roles/nas/templates/nfs_sysconfig.j2
@@ -8,7 +8,7 @@ LOCKD_UDPPORT=61005
 LOCKD_TCPPORT=61005
 
 STATDARG="-n ${NFS_HOSTNAME}"
-STATD_HA_CALLOUT="/etc/ctdb/statd-callout"
+STATD_HA_CALLOUT="{{ ctdb_config_dir }}/statd-callout"
 
 RPCNFSDARGS="-N 4"
 RPCNFSDCOUNT=8