ad-server/-replication: update shell module usage and formatting

ad-server-replication/tasks/main.yml

@@ -41,14 +41,14 @@
         # yamllint disable-line rule:line-length
         shell: samba-tool domain join "{{ domain }}" DC -U"{{ domain }}/Administrator" --dns-backend=NONE --option="idmap_ldb:use rfc2307=yes" 2> /root/provision.log
         responses:
-          "Password for.*": "{{ lookup('passwordstore', ad_admin_password) }}"
+          "Password for.*": "{{ ad_admin_password_content }}"
       no_log: true
       tags:
         - ad-server
         - domain-provision
 
     - name: ensure the idmap library is exported
-      shell: tdbbackup -s .bak /var/lib/samba/private/idmap.ldb
+      command: tdbbackup -s .bak /var/lib/samba/private/idmap.ldb
       delegate_to: "{{ ad_primary }}"
       tags:
         - ad-server
@@ -62,7 +62,7 @@
       tags:
         - ad-server
         - domain-provision
-  when: domain_provisioned.stat.exists == False
+  when: not domain_provisioned.stat.exists
 
 - name: ensure smb.conf is correct
   template:

ad-server/tasks/main.yml

@@ -27,7 +27,7 @@
   file:
     path: /etc/samba/smb.conf
     state: absent
-  when: domain_provisioned.stat.exists == False
+  when: not domain_provisioned.stat.exists
   tags:
     - ad-server
     - domain-provision
@@ -35,8 +35,8 @@
 # passwords will be selected at random and safed to /root/smb-provision.log)
 - name: ensure domain is provisioned
   # yamllint disable-line rule:line-length
-  shell: samba-tool domain provision --use-rfc2307 --domain={{ smb_domain }} --server-role=dc --host-name={{ ansible_hostname }} --realm={{ REALM }} --dns-backend=NONE --adminpass={{ lookup('passwordstore', ad_admin_password) }} 2>/root/smb-provision.log
-  when: domain_provisioned.stat.exists == False
+  shell: samba-tool domain provision --use-rfc2307 --domain={{ smb_domain }} --server-role=dc --host-name={{ ansible_hostname }} --realm={{ REALM }} --dns-backend=NONE --adminpass={{ ad_admin_password_content }} 2>/root/smb-provision.log
+  when: not domain_provisioned.stat.exists
   no_log: true
   tags:
     - ad-server