From 590f5c012cfeab30c2dc0ec1c3c66d1966cb8e4f Mon Sep 17 00:00:00 2001 From: Thomas Constans Date: Tue, 12 May 2020 13:16:34 +0200 Subject: [PATCH] slapd: fix ansible-lint warnings --- meta/main.yml | 62 ++++++++++++++++++++++++-------------------------- tasks/main.yml | 3 ++- tests/test.yml | 2 +- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index 3a212a9..66b1ca8 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,45 +1,44 @@ galaxy_info: - author: your name - description: your description - company: your company (optional) + role_name: slapd + author: Thomas Constans + description: install openldap-server, optionally setup replication + company: www.opendoor.fr # If the issue tracker for your role is not on github, uncomment the # next line and provide a value # issue_tracker_url: http://example.com/issue/tracker - # Choose a valid license ID from https://spdx.org - some suggested licenses: - # - BSD-3-Clause (default) + # Some suggested licenses: + # - BSD (default) # - MIT - # - GPL-2.0-or-later - # - GPL-3.0-only - # - Apache-2.0 - # - CC-BY-4.0 - license: license (GPL-2.0-or-later, MIT, etc) + # - GPLv2 + # - GPLv3 + # - Apache + # - CC-BY + license: GPLv2 - min_ansible_version: 2.4 + min_ansible_version: 2.0 # If this a Container Enabled role, provide the minimum Ansible Container version. # min_ansible_container_version: - # - # Provide a list of supported platforms, and for each platform a list of versions. - # If you don't wish to enumerate all versions for a particular platform, use 'all'. - # To view available platforms and versions (or releases), visit: - # https://galaxy.ansible.com/api/v1/platforms/ - # - # platforms: - # - name: Fedora - # versions: - # - all - # - 25 - # - name: SomePlatform - # versions: - # - all - # - 1.0 - # - 7 - # - 99.99 + # Optionally specify the branch Galaxy will use when accessing the GitHub + # repo for this role. During role install, if no tags are available, + # Galaxy will use this branch. During import Galaxy will access files on + # this branch. If Travis integration is configured, only notifications for this + # branch will be accepted. Otherwise, in all cases, the repo's default branch + # (usually master) will be used. + #github_branch: - galaxy_tags: [] + # + # platforms is a list of platforms, and each platform has a name and a list of versions. + # + platforms: + - name: EL + versions: + - 7 + + galaxy_tags: [ldap,slapd] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to # remove the '[]' above, if you add tags to this list. @@ -47,7 +46,6 @@ galaxy_info: # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. -dependencies: [] + dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, - # if you add dependencies to this list. - \ No newline at end of file + # if you add dependencies to this list. \ No newline at end of file diff --git a/tasks/main.yml b/tasks/main.yml index 5b713ee..70a8229 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -141,9 +141,10 @@ register: ldif_list - name: import ldif files - command: "ldapadd -c -y {{ ldap_secret_file }} -xD {{ ldap_admin_dn }} -f {{ item .path}}" + command: "ldapadd -c -y {{ ldap_secret_file }} -xD {{ ldap_admin_dn }} -f {{ item .path }}" with_items: "{{ ldif_list.files }}" ignore_errors: true + when: ldap_ldif_files is defined - name: configure replication provider diff --git a/tests/test.yml b/tests/test.yml index f4b68d8..d95e33d 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - /etc/ansible/roles/slapd \ No newline at end of file + - slapd \ No newline at end of file