From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Tue, 20 Oct 2020 13:02:58 +0000 (+0200)
Subject: Cleaning up
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=58cd275ce31c2b6dcde2889e0890c35a1202e780;p=pixelpark%2Fldap-migration.git

Cleaning up
---

diff --git a/roles/base/tasks/consumers_per_db.yaml b/roles/base/tasks/consumers_per_db.yaml
index 9103acc..e65df01 100644
--- a/roles/base/tasks/consumers_per_db.yaml
+++ b/roles/base/tasks/consumers_per_db.yaml
@@ -17,12 +17,6 @@
 - set_fact:
     db_dn: "olcDatabase={{ database_name }},cn=config"
 
-# - name: "Acticvating SyncRepl consumers for database '{{ database_name }}' for providers ..."
-#   include_tasks: "consumers_per_provider.yaml"
-#   loop: "{{ groups['providers'] }}"
-#   loop_control:
-#     loop_var: provider_host
-
 - name: "Get state of possibly applied SyncRepl consumers for database '{{ database_name }}'."
   shell: "ldapsearch -Q -Y EXTERNAL -H ldapi:/// -LLL -s base -b '{{ db_dn }}' -o ldif-wrap olcSyncrepl | grep -i '^olcSyncrepl'"
   changed_when: False
diff --git a/roles/base/tasks/consumers_per_provider.yaml b/roles/base/tasks/consumers_per_provider.yaml
deleted file mode 100644
index b9ea246..0000000
--- a/roles/base/tasks/consumers_per_provider.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-
-- name: "Acticvating SyncRepl consumers for database '{{ database_name }}' and provider {{ provider_host }} ..."
-  block:
-
-  - set_fact:
-      rid: "{{ hostvars[provider_host].rid_token }}{{ rid_token }}{{ db_id_token }}"
-
-  - set_fact:
-    provider_uri: "ldaps://{{ hostvars[provider_host].ansible_fqdn }}"
-
-  - name: "Get state of an possibly applied SyncRepl consumers for database '{{ database_name }}' and provider {{ provider_host }} ..."
-    shell: "ldapsearch -Q -Y EXTERNAL -H ldapi:/// -LLL -s base -b '{{ db_dn }}' -o ldif-wrap olcSyncrepl | grep -i '^olcSyncrepl'| sed -e 's/^olcSyncrepl:[ 	]*//i' | grep -i 'provider={{ provider_uri }}'"
-    changed_when: False
-    ignore_errors: True
-    no_log: True
-    register: get_syncrepl_entry
-
-  - name: "Applying SyncRepl consumers for database '{{ database_name }}' and provider {{ provider_host }} ..."
-    block:
-
-    - name: "Initializing LDIF file for applying SyncRepl consumers"
-      tempfile:
-        state: 'file'
-        prefix: 'syncrepl.'
-        suffix: '.ldif'
-      register: syncrepl_file
-
-    - name: "Get content of applying SyncRepl consumers"
-      template:
-        src: "templates/syncrepl-add.ldif.j2"
-        dest: "{{ syncrepl_file.path }}"
-        owner: root
-        group: root
-        mode: 0644
-
-    - name: "Get content of applying SyncRepl consumers file"
-      shell: "cat '{{ syncrepl_file.path }}'"
-      register: content_syncrepl_file
-      changed_when: False
-      no_log: True
-
-    - name: "Show content of applying SyncRepl consumers file."
-      debug: msg={{ content_syncrepl_file.stdout_lines }}
-
-    - name: "Applying SyncRepl consumers file at the end ..."
-      shell: "ldapmodify -Q -Y EXTERNAL -H ldapi:/// -f '{{ syncrepl_file.path }}'"
-
-    rescue:
-      - name: "Failing base installation of OpenLDAP server because of some errors."
-        fail:
-          msg: "I caught an error"
-
-    always:
-
-      - name: "Removing applying SyncRepl consumers file ..."
-        file:
-          path: "{{ syncrepl_file.path }}"
-          state: absent
-
-    when: get_syncrepl_entry.rc != 0
-
-  when: provider_host != ansible_fqdn
-
diff --git a/roles/base/templates/server-ids.ldif b/roles/base/templates/server-ids.ldif
deleted file mode 100644
index e9fd74e..0000000
--- a/roles/base/templates/server-ids.ldif
+++ /dev/null
@@ -1,6 +0,0 @@
-dn: cn=config
-changetype: modify
-add: olcServerID
-olcServerID: 1 ldaps://dev-ds11.pixelpark.com
-olcServerID: 2 ldaps://dev-ds12.pixelpark.com
-olcServerID: 3 ldaps://dev-ds13.pixelpark.com