refs #8142: Split tasks using the new main_ad variable

roles/services/tasks/adsamba.yml

@@ -38,21 +38,12 @@
     block: |
       {{ ip_serverad | default(ansible_default_ipv4.address) }}  {{ ansible_facts['hostname'] }}.{{ domain }}.{{ resolv_domain }} {{ realm }}
 
-- name: Check if metadata.tdb exists and is not empty
+- name: Check if metadata.tdb exists
   stat:
     path: /var/lib/samba/private/sam.ldb.d/metadata.tdb
   register: metadata_tdb
 
-- name: Register domain existence
+- when: metadata_tdb.stat.exists is false
-  set_fact:
-    domain_exists: >-
-      {{
-        ('samba-ad-provision' in ansible_facts.packages or
-        'samba-ad-dc' in ansible_facts.packages) and
-        (metadata_tdb.stat.exists and metadata_tdb.stat.size > 0)
-      }}
-
-- when: "not domain_exists"
   block:
 
   - name: Force remove smb.conf file
@@ -61,7 +52,9 @@
       state: absent
       force: yes
 
-  - name: Join domain 
+  - when: main_ad is true
+    block:
+    - name: Provision domain 
       command:
         cmd: samba-tool domain provision --realm="{{ realm }}" --domain="{{ domain }}" --dns-backend=SAMBA_INTERNAL --server-role=dc --use-rfc2307
       register: domain_join
@@ -70,23 +63,6 @@
       debug:
         msg: "{{ domain_join.stderr_lines[-6:] }}"
     
-  - name: Copy Kerberos configuration
-    copy:
-      src: /var/lib/samba/private/krb5.conf
-      dest: /etc/krb5.conf
-      remote_src: true
-      owner: root
-      group: root
-      mode: '0644'
-    when: domain_join.changed
-
-  - name: Enable and start Samba AD DC service
-    systemd:
-      name: samba-ad-dc
-      state: started
-      enabled: yes
-    when: domain_join.changed
-
     - name: Extracting variables
       no_log: true
       set_fact:
@@ -118,6 +94,29 @@
         value: '{{ name_ad }}.{{ realm }}.'
         state: present
     
+  - when: main_ad is false
+    block:
+    - name: Join domain
+      debug:
+        msg:
+          - "metadata_tdb: {{ metadata_tdb }}"
+          - "main_ad: {{ main_ad }}"
+
+  - name: Copy Kerberos configuration
+    copy:
+      src: /var/lib/samba/private/krb5.conf
+      dest: /etc/krb5.conf
+      remote_src: true
+      owner: root
+      group: root
+      mode: '0644'
+
+  - name: Enable and start Samba AD DC service
+    systemd:
+      name: samba-ad-dc
+      state: started
+      enabled: yes
+
 - name: Disable Samba client services and mask them
   systemd:
     name: "{{ item }}"