Skip to content

Commit eb72fbe

Browse files
committed
refactor(conf): replace embedded templates
Replace embedded templates by string concatenations or direct usage of variables.
1 parent 3b0ec3e commit eb72fbe

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ and this project adheres to
156156
- Support Rackslab development repository derivatives on RHEL.
157157
- Add admin hostname with namespace in addition to just the admin hostname in
158158
Slurm-web nginx site server names.
159+
- Replace embedded templates by string concatenations.
159160
- docs: Various formatting errors in manpage.
160161

161162
### Removed

conf/roles/slurm/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ slurm_local_jwt_key_file: jwt_hs256.key # dummy
1818
# The lookup errors are ignored because the variable is loaded by boostrap
1919
# tasks file (in bootstrap playbook) before it generates the file. This way, a
2020
# warning is displayed but Ansible continues instead of failing with the error.
21-
slurm_db_password: "{{ lookup('file', '{{ slurm_local_mariadb_password_file }}', errors='ignore') }}"
21+
slurm_db_password: "{{ lookup('file', slurm_local_mariadb_password_file, errors='ignore') }}"
2222
slurm_with_db_archive: true
2323
slurm_db_archive_dir: /var/lib/slurm/slurmdbd
2424
slurm_db_purge_after: 14days

conf/roles/ssh/tasks/localkeys.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
ansible.builtin.known_hosts:
1919
path: "{{ ssh_key_dir }}/known_hosts"
2020
name: "{{ item.0 }}"
21-
key: "{{ item.0 }},{{ item.0.split('.')[0] }} {{ lookup('file', '{{ ssh_key_dir }}/hosts/{{ item.0 }}/ssh_host_{{ item.1 }}_key.pub') }}"
21+
key: "{{ item.0 }},{{ item.0.split('.')[0] }} {{ lookup('file', ssh_key_dir ~ '/hosts/' ~ item.0 ~ '/ssh_host_' ~ item.1 ~ '_key.pub') }}"
2222
loop: "{{ groups['all'] | product(ssh_key_types) | list }}"
2323

2424
- name: Generate SSH root keys

0 commit comments

Comments
 (0)