Skip to content

Commit

Permalink
Fix lint, ignore invalid role name
Browse files Browse the repository at this point in the history
  • Loading branch information
lvps committed Jun 2, 2021
1 parent 17d6b61 commit 7fb6fe0
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
---
skip_list:
- 106
- 503
- 'role-name' # Cannot start with a number, which is unfortunate for a software named 389DS
2 changes: 2 additions & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ dirsrv_server_uri: "ldap://localhost:{{ dirsrv_port }}"

dirsrv_install_examples: false
dirsrv_install_additional_ldif: []
# Cannot use /tmp, see https://github.com/lvps/389ds-server/issues/18
dirsrv_install_additional_ldif_dir: "/var/lib/dirsrv/slapd-{{ dirsrv_serverid }}/ldif"

# Logging

Expand Down
3 changes: 1 addition & 2 deletions molecule/backwards_compatibility/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@
force: true

roles:
-
role: 389ds-server
- role: lvps.389ds_server

tasks:
- name: Ensure we can access the server, for testing
Expand Down
3 changes: 1 addition & 2 deletions molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@
force: true

roles:
-
role: 389ds-server
- role: lvps.389ds_server

tasks:
- name: Ensure we can access the server, for testing
Expand Down
3 changes: 1 addition & 2 deletions molecule/other_features/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@
force: true

roles:
-
role: 389ds-server
- role: lvps.389ds_server

tasks:
- name: Ensure container entries exist, for testing
Expand Down
3 changes: 1 addition & 2 deletions molecule/tls/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@
dirsrv_tls_minssf: "{%if ansible_facts['distribution_major_version'] | int == 8 %}128{% else %}256{% endif %}"

roles:
-
role: 389ds-server
- role: lvps.389ds_server

tasks:
- name: Ensure we can access the server, for testing
Expand Down
1 change: 1 addition & 0 deletions tasks/configure_authentication.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
# With 389DS version 1.4.X the option to delete this attribute to reset it to the default value has been removed.
# Instead, we have to set it to "DEFAULT" (case sensitive).
- name: Normalize password storage scheme
no_log: true # Could be logged but ansible-lint complains as it detects the word "password"
set_fact:
dirsrv_normalized_password_storage_scheme: >-
{% if not dirsrv_legacy and dirsrv_password_storage_scheme == [] %}DEFAULT{% else %}{{ dirsrv_password_storage_scheme }}{% endif %}
Expand Down

0 comments on commit 7fb6fe0

Please sign in to comment.