From 2c72c8c6c950377cfae4171d4b27bb58bedcefe8 Mon Sep 17 00:00:00 2001 From: shirenn <shirenn@crans.org> Date: Thu, 6 Aug 2020 19:36:34 +0200 Subject: [PATCH] [proxmox] tout pleins de nouveaux copains --- group_vars/all/vars.yaml | 2 +- host_vars/jack.adm.crans.org.yml | 8 ++++++++ host_vars/sam.adm.crans.org.yml | 8 ++++++++ hosts | 2 ++ plays/root.yml | 1 + roles/proxmox-apt-sources/tasks/main.yml | 4 ++-- .../{pve-entreprise.list.j2 => pve-enterprise.list.j2} | 0 7 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 host_vars/jack.adm.crans.org.yml create mode 100644 host_vars/sam.adm.crans.org.yml rename roles/proxmox-apt-sources/templates/apt/sources.list.d/{pve-entreprise.list.j2 => pve-enterprise.list.j2} (100%) diff --git a/group_vars/all/vars.yaml b/group_vars/all/vars.yaml index dba06cb7..b33dd868 100644 --- a/group_vars/all/vars.yaml +++ b/group_vars/all/vars.yaml @@ -49,5 +49,5 @@ glob_ldap: - 172.16.10.13 base: 'dc=crans,dc=org' -home-nounous: +home_nounous: ip: 172.16.10.1 diff --git a/host_vars/jack.adm.crans.org.yml b/host_vars/jack.adm.crans.org.yml new file mode 100644 index 00000000..bfca9922 --- /dev/null +++ b/host_vars/jack.adm.crans.org.yml @@ -0,0 +1,8 @@ +--- +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 new file mode 100644 index 00000000..5d5fde7e --- /dev/null +++ b/host_vars/sam.adm.crans.org.yml @@ -0,0 +1,8 @@ +--- +loc_slapd: + ip: 172.16.10.11 + replica: true + replica_rid: 1 + +loc_ldap: + local: false diff --git a/hosts b/hosts index a7cd86a1..7a3e9cc5 100644 --- a/hosts +++ b/hosts @@ -41,7 +41,9 @@ routeur-daniel [crans_physical] tealc.adm.crans.org +sam.adm.crans.org daniel.adm.crans.org +jack.adm.crans.org [crans_vm] belenios # on changera plus tard diff --git a/plays/root.yml b/plays/root.yml index ac0de129..06188c07 100755 --- a/plays/root.yml +++ b/plays/root.yml @@ -32,3 +32,4 @@ ldap: '{{ glob_ldap | combine(loc_ldap) }}' roles: - ldap-client + - home-nounous diff --git a/roles/proxmox-apt-sources/tasks/main.yml b/roles/proxmox-apt-sources/tasks/main.yml index 4d66e393..1774927c 100644 --- a/roles/proxmox-apt-sources/tasks/main.yml +++ b/roles/proxmox-apt-sources/tasks/main.yml @@ -1,5 +1,5 @@ --- - name: Configure Proxmox repositories template: - src: apt/sources.list.d/pve-entreprise.list.j2 - dest: /etc/apt/sources.list.d/pve-entreprise.list + src: apt/sources.list.d/pve-enterprise.list.j2 + dest: /etc/apt/sources.list.d/pve-enterprise.list diff --git a/roles/proxmox-apt-sources/templates/apt/sources.list.d/pve-entreprise.list.j2 b/roles/proxmox-apt-sources/templates/apt/sources.list.d/pve-enterprise.list.j2 similarity index 100% rename from roles/proxmox-apt-sources/templates/apt/sources.list.d/pve-entreprise.list.j2 rename to roles/proxmox-apt-sources/templates/apt/sources.list.d/pve-enterprise.list.j2