Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ansible/roles/mariadb/tasks/manage_contents.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@
name: '{{ item.user | d(item.name) }}'
host: '{{ item.host | default(mariadb__client) }}'
state: 'present'
password: '{{ item.password | default(lookup("password",
password: '{{ item.password if item.password is defined else lookup("password",
secret + "/mariadb/" + mariadb__delegate_to +
"/credentials/" + item.user | d(item.name) + "/password " +
"length=" + mariadb__password_length)) }}'
"length=" + mariadb__password_length) }}'
login_unix_socket: '/run/mysqld/mysqld.sock'
loop: '{{ q("flattened", mariadb__users + mariadb__dependent_users + mariadb_users | d([])) }}'
delegate_to: '{{ mariadb__delegate_to }}'
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/mariadb/templates/home/my.cnf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ port={{ item.server_port | d(mariadb__port) }}
# port={{ item.server_port | d(mariadb__port) }}
{% endif %}
user={{ item.user | d(item.name) }}
password="{{ item.password | default(lookup('password', secret + '/mariadb/' + mariadb__delegate_to | d('undefined') + '/credentials/' + item.user | d(item.name) + '/password ' + 'length=' + mariadb__password_length)) }}"
password="{{ item.password if item.password is defined else lookup('password', secret + '/mariadb/' + mariadb__delegate_to | d('undefined') + '/credentials/' + item.user | d(item.name) + '/password ' + 'length=' + mariadb__password_length) }}"
{% if item.database | d(False) %}
database={{ item.database }}
{% endif %}
Expand Down
8 changes: 4 additions & 4 deletions ansible/roles/postgresql/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@
community.postgresql.postgresql_user:
name: '{{ item.name | d(item.role) }}'
port: '{{ item.port | d(postgresql__port if postgresql__port else omit) }}'
password: '{{ item.password | d(lookup("password",
password: '{{ item.password if item.password is defined else lookup("password",
secret + "/postgresql/" + postgresql__password_hostname +
"/" + (item.port | d(postgresql__port)) +
"/credentials/" + item.name | d(item.role) + "/password " +
"length=" + postgresql__password_length + " chars=" + postgresql__password_characters)) }}'
"length=" + postgresql__password_length + " chars=" + postgresql__password_characters) }}'
encrypted: '{{ item.encrypted | d(True) }}'
expires: '{{ item.expires | d(omit) }}'
role_attr_flags: '{{ (item.flags | d() | join(",")) | d(omit) }}'
Expand Down Expand Up @@ -268,11 +268,11 @@
(item.port | d(postgresql__port)),
(item.database | d("*")),
(item.role | d(item.owner)),
(item.password | d(lookup("password",
(item.password if item.password is defined else lookup("password",
secret + "/postgresql/" + (item.server | d(postgresql__password_hostname))
+ "/" + (item.port | d(postgresql__port)) + "/credentials/"
+ item.name | d(item.role | d(item.owner))
+ "/password length=" + postgresql__password_length))
+ "/password length=" + postgresql__password_length)
| regex_replace("\\", "\\\\") | regex_replace(":", "\:"))]
| join(":") }}'
state: 'present'
Expand Down
19 changes: 14 additions & 5 deletions ansible/roles/rabbitmq_server/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@

- name: Manage RabbitMQ user accounts
community.rabbitmq.rabbitmq_user:
user: '{{ item.user | d(item.name) | d(item) }}'

Check warning on line 205 in ansible/roles/rabbitmq_server/tasks/main.yml

View workflow job for this annotation

GitHub Actions / build

jinja[spacing]

Jinja2 spacing could be improved: {{ item.password | d(omit) if ( (item.password is defined) or (item.state | d("present") == "absent") ) else lookup("password", secret + "/rabbitmq_server/accounts/" + (item.user | d(item.name | d(item))) + "/password length=" + rabbitmq_server__account_password_length ) }} -> {{ item.password | d(omit) if ((item.password is defined) or (item.state | d("present") == "absent")) else lookup("password", secret + "/rabbitmq_server/accounts/" + (item.user | d(item.name | d(item))) + "/password length=" + rabbitmq_server__account_password_length) }}

Check warning on line 205 in ansible/roles/rabbitmq_server/tasks/main.yml

View workflow job for this annotation

GitHub Actions / ansible-lint

jinja[spacing]

Jinja2 spacing could be improved: {{ item.password | d(omit) if ( (item.password is defined) or (item.state | d("present") == "absent") ) else lookup("password", secret + "/rabbitmq_server/accounts/" + (item.user | d(item.name | d(item))) + "/password length=" + rabbitmq_server__account_password_length ) }} -> {{ item.password | d(omit) if ((item.password is defined) or (item.state | d("present") == "absent")) else lookup("password", secret + "/rabbitmq_server/accounts/" + (item.user | d(item.name | d(item))) + "/password length=" + rabbitmq_server__account_password_length) }}

Check warning on line 205 in ansible/roles/rabbitmq_server/tasks/main.yml

View workflow job for this annotation

GitHub Actions / build

jinja[spacing]

Jinja2 spacing could be improved: {{ item.password | d(omit) if ( (item.password is defined) or (item.state | d("present") == "absent") ) else lookup("password", secret + "/rabbitmq_server/accounts/" + (item.user | d(item.name | d(item))) + "/password length=" + rabbitmq_server__account_password_length ) }} -> {{ item.password | d(omit) if ((item.password is defined) or (item.state | d("present") == "absent")) else lookup("password", secret + "/rabbitmq_server/accounts/" + (item.user | d(item.name | d(item))) + "/password length=" + rabbitmq_server__account_password_length) }}

Check warning on line 205 in ansible/roles/rabbitmq_server/tasks/main.yml

View workflow job for this annotation

GitHub Actions / ansible-lint

jinja[spacing]

Jinja2 spacing could be improved: {{ item.password | d(omit) if ( (item.password is defined) or (item.state | d("present") == "absent") ) else lookup("password", secret + "/rabbitmq_server/accounts/" + (item.user | d(item.name | d(item))) + "/password length=" + rabbitmq_server__account_password_length ) }} -> {{ item.password | d(omit) if ((item.password is defined) or (item.state | d("present") == "absent")) else lookup("password", secret + "/rabbitmq_server/accounts/" + (item.user | d(item.name | d(item))) + "/password length=" + rabbitmq_server__account_password_length) }}
force: '{{ item.force | d(omit) }}'
node: '{{ item.node | d(omit) }}'
permissions: '{{ item.permissions | d(omit) }}' # noqa args[module]
Expand All @@ -211,11 +211,20 @@
write_priv: '{{ item.write_priv | d(omit) }}'
state: '{{ item.state | d("present") }}'
vhost: '{{ item.vhost | d(omit) }}'
password: '{{ item.password | d(lookup("password",
secret + "/rabbitmq_server/accounts/"
+ (item.user | d(item.name | d(item)))
+ "/password length="
+ rabbitmq_server__account_password_length)) }}'

# Avoid a password lookup if the password is defined, or if the account
# is meant to be absent (in which case the password is ommitted).
password: '{{ item.password | d(omit) if (
(item.password is defined)
or
(item.state | d("present") == "absent")
) else lookup("password",
secret + "/rabbitmq_server/accounts/"
+ (item.user | d(item.name | d(item)))
+ "/password length="
+ rabbitmq_server__account_password_length
)
}}'
tags: '{{ (((item.tags.split(",") | list)
if (item.tags | d() and item.tags is string)
else item.tags) | join(","))
Expand Down
Loading