diff --git a/group_vars/all/vars.yaml b/group_vars/all/vars.yaml index b33dd8686d357c85e7b2299e2b34ab2df2124bcc..44aee99313dd6fc6fb6000ba16433defa7790fc6 100644 --- a/group_vars/all/vars.yaml +++ b/group_vars/all/vars.yaml @@ -48,6 +48,7 @@ glob_ldap: - 172.16.10.12 - 172.16.10.13 base: 'dc=crans,dc=org' + local: false # local configuration but default value home_nounous: ip: 172.16.10.1 diff --git a/host_vars/daniel.adm.crans.org.yml b/host_vars/daniel.adm.crans.org.yml index a7405b4db07cedbdcb9da8899fdc00253e18badf..139b9bd18d048ce5708bf3b6c6a7a7e8875fd72f 100644 --- a/host_vars/daniel.adm.crans.org.yml +++ b/host_vars/daniel.adm.crans.org.yml @@ -3,6 +3,3 @@ loc_slapd: ip: 172.16.10.12 replica: true replica_rid: 2 - -loc_ldap: - local: false diff --git a/host_vars/jack.adm.crans.org.yml b/host_vars/jack.adm.crans.org.yml index bfca9922d015ed4704229d23472e5cbda8f89caf..70c60054011cd428318f7397e7e73b185db6d5a9 100644 --- a/host_vars/jack.adm.crans.org.yml +++ b/host_vars/jack.adm.crans.org.yml @@ -3,6 +3,3 @@ loc_slapd: ip: 172.16.10.13 replica: true replica_rid: 3 - -loc_ldap: - local: false diff --git a/host_vars/sam.adm.crans.org.yml b/host_vars/sam.adm.crans.org.yml index 5d5fde7e8519f4543a76a136b56b9c71e221fa94..9ed74927b90b31aebb7ae2d2f97dfb6fa230d8e7 100644 --- a/host_vars/sam.adm.crans.org.yml +++ b/host_vars/sam.adm.crans.org.yml @@ -3,6 +3,3 @@ loc_slapd: ip: 172.16.10.11 replica: true replica_rid: 1 - -loc_ldap: - local: false diff --git a/plays/root.yml b/plays/root.yml index 06188c0745a0cb4de641c4a7a800d01e582f3df0..e07668edf62ed1f5aba9b7164cf5646c0a9ccbd6 100755 --- a/plays/root.yml +++ b/plays/root.yml @@ -23,13 +23,13 @@ - hosts: slapd vars: - slapd: '{{ glob_slapd | combine(loc_slapd) }}' + slapd: '{{ glob_slapd | combine(loc_slapd | default({})) }}' roles: - slapd - hosts: server vars: - ldap: '{{ glob_ldap | combine(loc_ldap) }}' + ldap: '{{ glob_ldap | combine(loc_ldap | default({})) }}' roles: - ldap-client - home-nounous