Skip to content

Commit

Permalink
ansible-scylla-node: Move the ssl crts generation to before scylla.yaml
Browse files Browse the repository at this point in the history
This is necessary since the scylla.yaml.j2 file uses variables  '_localhost_cert_path',
'_localhost_cert_key_path' and '_truststore_exists', which are defined only
in the ssl task.
  • Loading branch information
igorribeiroduarte committed Dec 6, 2024
1 parent d78962c commit 0a06a71
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions ansible-scylla-node/tasks/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,13 @@
when: (scylla_package_prefix + '-node-exporter') in ansible_facts.packages
become: true

- name: enable ssl options
include_tasks: ssl.yml
when:
- scylla_ssl is defined
- (scylla_ssl.internode.enabled|bool) or
(scylla_ssl.client.enabled|bool)

- name: configure scylla.yaml
template:
src: templates/scylla.yaml.j2
Expand Down Expand Up @@ -300,13 +307,6 @@
become: true
loop: "{{ lookup('dict', scylla_yaml_params) }}"

- name: enable ssl options
include_tasks: ssl.yml
when:
- scylla_ssl is defined
- (scylla_ssl.internode.enabled|bool) or
(scylla_ssl.client.enabled|bool)

- name: Copy system keys
include_tasks: handle_encryption_at_rest_keys.yml
vars:
Expand Down

0 comments on commit 0a06a71

Please sign in to comment.