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

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

diff --git a/ansible/node/roles/ad/tasks/generic/configure_ad.yml b/ansible/node/roles/ad/tasks/generic/configure_ad.yml
index c56d1e47d2d63f6c37d3ae2524974b5b013aac1a..bc7200068cfd7310ee6f7d539b8f6d419f2ab404 100644 (file)
--- a/ansible/node/roles/ad/tasks/generic/configure_ad.yml
+++ b/ansible/node/roles/ad/tasks/generic/configure_ad.yml
@@ -5,8 +5,12 @@
   register: ad_active
 
 - name: remove smb.conf
+  vars:
+    tdir: "{{ tarball_install_prefix }}/etc"
+    pdir: /etc/samba
+    samba_config_dir: "{{ tdir if tarball is not none else pdir }}"
   file:
-    path: /etc/samba/smb.conf
+    path: "{{ samba_config_dir }}/smb.conf"
     state: absent
   when: not ad_active.stat.exists
 

diff --git a/ansible/node/roles/ad/tasks/main.yml b/ansible/node/roles/ad/tasks/main.yml
index 6b0e811aec67255d3e25d0e5042e627b07304ce5..cba49848ff8479585ac7c7bff8f62a6d16c6a3cf 100644 (file)
--- a/ansible/node/roles/ad/tasks/main.yml
+++ b/ansible/node/roles/ad/tasks/main.yml
@@ -4,6 +4,14 @@
   - packages
   loop_control:
     loop_var: task
+  when: tarball is none
+
+- include_role:
+    name: tarball_common
+    tasks_from: install_ad.yml
+  vars:
+    source_tarball: "{{ tarball }}"
+  when: tarball is not none
 
 - include_tasks: generic/{{ task }}.yml
   with_list: