From 610bcfbe2362a7631ad10e5c0a56c48d904c0480 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Thu, 27 May 2021 17:52:00 +0200
Subject: [PATCH] [re2o-ldap] Deploy re2o-ldap-replica on re2o-dev, use terenez
as main server
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
group_vars/re2o_ldap_replica.yml | 2 +-
host_vars/re2o-dev.adm.crans.org.yml | 3 +++
host_vars/yson-partou.adm.crans.org.yml | 3 +++
hosts | 5 +++--
plays/re2o-ldap-replica.yml | 7 +++++++
5 files changed, 17 insertions(+), 3 deletions(-)
create mode 100644 host_vars/yson-partou.adm.crans.org.yml
create mode 100755 plays/re2o-ldap-replica.yml
diff --git a/group_vars/re2o_ldap_replica.yml b/group_vars/re2o_ldap_replica.yml
index 474f735a..ae4b34c1 100644
--- a/group_vars/re2o_ldap_replica.yml
+++ b/group_vars/re2o_ldap_replica.yml
@@ -4,7 +4,7 @@ glob_re2o_ldap_replica:
username: replicator
password: "{{ vault.ldap_replication_re2o_credentials }}"
suffix: dc=crans,dc=org
- url: "ldaps://{{ query('ldap', 'ip', 're2o-ldap', 'adm') | ipv4 | first }}:636"
+ url: "ldaps://{{ query('ldap', 'ip', 'terenez', 'adm') | ipv4 | first }}:636"
root_password_hash: "{{ vault.ldap_master_password_hash }}"
certificate: "{{ vault.ldap_re2o_certificate }}"
private_key: "{{ vault.ldap_re2o_private_key }}"
diff --git a/host_vars/re2o-dev.adm.crans.org.yml b/host_vars/re2o-dev.adm.crans.org.yml
index 2eb6f993..ce6dec6c 100644
--- a/host_vars/re2o-dev.adm.crans.org.yml
+++ b/host_vars/re2o-dev.adm.crans.org.yml
@@ -2,3 +2,6 @@
interfaces:
adm: eth0
srv_nat: eth1
+
+loc_re2o_ldap_replica:
+ url: "ldaps://{{ query('ldap', 'ip', 'yson-partou', 'adm') | ipv4 | first }}:636"
diff --git a/host_vars/yson-partou.adm.crans.org.yml b/host_vars/yson-partou.adm.crans.org.yml
new file mode 100644
index 00000000..5cde2044
--- /dev/null
+++ b/host_vars/yson-partou.adm.crans.org.yml
@@ -0,0 +1,3 @@
+---
+interfaces:
+ adm: eth0
diff --git a/hosts b/hosts
index a17924d5..ad709e4d 100644
--- a/hosts
+++ b/hosts
@@ -158,8 +158,9 @@ radius
re2o.adm.crans.org
re2o.cachan-adm.crans.org
-[re2o_ldap_replica:children]
-adh_server
+[re2o_ldap_replica]
+re2o-dev.adm.crans.org
+yson-partou.adm.crans.org
[reverseproxy]
hodaur.adm.crans.org
diff --git a/plays/re2o-ldap-replica.yml b/plays/re2o-ldap-replica.yml
new file mode 100755
index 00000000..1d1344a0
--- /dev/null
+++ b/plays/re2o-ldap-replica.yml
@@ -0,0 +1,7 @@
+#!/usr/bin/env ansible-playbook
+---
+- hosts: re2o_ldap_replica
+ vars:
+ re2o_ldap_replica: "{{ glob_re2o_ldap_replica | default({}) | combine(loc_re2o_ldap_replica | default({})) }}"
+ roles:
+ - re2o-ldap-replica