From ae519a62e1a12a0e94c03168362306e2758a6ffe Mon Sep 17 00:00:00 2001 From: Paul Steinlechner Date: Mon, 27 Jun 2016 14:06:54 +0200 Subject: [PATCH] Fix deprecated use of bare variables and error with environment env --- tasks/install_ldap.yml | 5 ++--- templates/slapd.conf_ubuntu.j2 | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tasks/install_ldap.yml b/tasks/install_ldap.yml index c2aba5e..73749bb 100644 --- a/tasks/install_ldap.yml +++ b/tasks/install_ldap.yml @@ -5,14 +5,13 @@ - name: Install the openldap and required Packages for RedHat yum: name={{ item }} state=installed - with_items: openldap_server_pkgs + with_items: "{{ openldap_server_pkgs }}" when: ansible_os_family == 'RedHat' - name: Install the openldap and required Packages for Ubuntu apt: name={{ item }} state=installed update_cache=yes - with_items: openldap_server_pkgs - environment: env + with_items: "{{ openldap_server_pkgs }}" when: ansible_os_family == 'Debian' - name: Delete the configuration directory diff --git a/templates/slapd.conf_ubuntu.j2 b/templates/slapd.conf_ubuntu.j2 index f256ed6..fb4922a 100644 --- a/templates/slapd.conf_ubuntu.j2 +++ b/templates/slapd.conf_ubuntu.j2 @@ -28,7 +28,7 @@ access to attrs=shadowLastChange database bdb suffix "dc={{ openldap_server_domain_name.split('.')[0] }},dc={{ openldap_server_domain_name.split('.')[1] }}" rootdn "cn=Manager,dc={{ openldap_server_domain_name.split('.')[0] }},dc={{ openldap_server_domain_name.split('.')[1] }}" -rootpw {{ root_password.stdout }} +rootpw "{{ root_password.stdout }}" #This directory has to be created and would contain the ldap database. directory /var/lib/ldap/{{ openldap_server_domain_name }}/ index objectClass eq,pres