From 56acc3b293ebb47cf130258a7071eed7df8f0d2c Mon Sep 17 00:00:00 2001
From: shirenn <shirenn@crans.org>
Date: Fri, 7 Aug 2020 00:04:53 +0200
Subject: [PATCH] [ldap][slapd] Variable merge
---
group_vars/all/vars.yaml | 1 +
host_vars/daniel.adm.crans.org.yml | 3 ---
host_vars/jack.adm.crans.org.yml | 3 ---
host_vars/sam.adm.crans.org.yml | 3 ---
plays/root.yml | 4 ++--
5 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/group_vars/all/vars.yaml b/group_vars/all/vars.yaml
index b33dd868..44aee993 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 a7405b4d..139b9bd1 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 bfca9922..70c60054 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 5d5fde7e..9ed74927 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 06188c07..e07668ed 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
--
GitLab