Skip to content
Snippets Groups Projects
Commit 43ad6950 authored by Thomas Schneider's avatar Thomas Schneider
Browse files

Merge branch 'clean-variable-leak' into 'master'

Properly scope shared variable spaces

See merge request !8
parents a7167ee0 399d1370
No related branches found
No related tags found
1 merge request!8Properly scope shared variable spaces
Pipeline #3956 passed
...@@ -3,3 +3,5 @@ ...@@ -3,3 +3,5 @@
ad_admin_password: samba-admin ad_admin_password: samba-admin
smb_model_prefork: false smb_model_prefork: false
smb_prefork_children: 4 # since it is default in 4.10 smb_prefork_children: 4 # since it is default in 4.10
smb_domain: "{{ domain.split('.')[0].upper() }}"
REALM: "{{ domain.upper() }}"
...@@ -3,3 +3,5 @@ ...@@ -3,3 +3,5 @@
ad_admin_password: samba-admin ad_admin_password: samba-admin
smb_model_prefork: false smb_model_prefork: false
smb_prefork_children: 4 # since it is default in 4.10 smb_prefork_children: 4 # since it is default in 4.10
smb_domain: "{{ domain.split('.')[0].upper() }}"
REALM: "{{ domain.upper() }}"
---
nfs_krb: false
nfs_krb_primary_ad_server: "{{ ad_primary|default(hostvars[groups['servers_ad'][0]]['ansible_host']) }}"
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
- name: create service principal - name: create service principal
# yamllint disable-line rule:line-length # yamllint disable-line rule:line-length
command: samba-tool spn add "nfs/{{ ansible_fqdn }}" "{{ ansible_hostname | upper }}$" command: samba-tool spn add "nfs/{{ ansible_fqdn }}" "{{ ansible_hostname | upper }}$"
delegate_to: "{{ hostvars[groups['servers_ad'][0]]['ansible_host'] }}" delegate_to: "{{ nfs_krb_primary_ad_server }}"
tags: tags:
- nfs-server - nfs-server
- service-principal - service-principal
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
command: samba-tool domain exportkeytab "/root/{{ ansible_fqdn }}.keytab" --principal "nfs/{{ ansible_fqdn }}" command: samba-tool domain exportkeytab "/root/{{ ansible_fqdn }}.keytab" --principal "nfs/{{ ansible_fqdn }}"
args: args:
creates: "/root/{{ ansible_fqdn }}.keytab" creates: "/root/{{ ansible_fqdn }}.keytab"
delegate_to: "{{ hostvars[groups['servers_ad'][0]]['ansible_host'] }}" delegate_to: "{{ nfs_krb_primary_ad_server }}"
tags: tags:
- nfs-server - nfs-server
- service-principal - service-principal
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
synchronize: synchronize:
src: "/root/{{ ansible_fqdn }}.keytab" src: "/root/{{ ansible_fqdn }}.keytab"
dest: "/root/{{ ansible_fqdn }}.keytab" dest: "/root/{{ ansible_fqdn }}.keytab"
delegate_to: "{{ hostvars[groups['servers_ad'][0]]['ansible_host'] }}" delegate_to: "{{ nfs_krb_primary_ad_server }}"
tags: tags:
- nfs-server - nfs-server
- service-principal - service-principal
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
file: file:
path: "/root/{{ ansible_fqdn }}.keytab" path: "/root/{{ ansible_fqdn }}.keytab"
state: absent state: absent
delegate_to: "{{ hostvars[groups['servers_ad'][0]]['ansible_host'] }}" delegate_to: "{{ nfs_krb_primary_ad_server }}"
tags: tags:
- nfs-server - nfs-server
- service-principal - service-principal
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment