Fix kafka keystore script

Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>
This commit is contained in:
reyesj2
2024-04-02 16:32:15 -04:00
parent 26abe90671
commit 1b49c8540e
2 changed files with 109 additions and 101 deletions

View File

@@ -16,7 +16,7 @@
{% set nodes = salt['pillar.get']('kafka:nodes', {}) %} {% set nodes = salt['pillar.get']('kafka:nodes', {}) %}
{% set combined = [] %} {% set combined = [] %}
{% for hostname, data in nodes.items() %} {% for hostname, data in nodes.items() %}
{% do combined.append(data.nodeid ~ "@" ~ hostname) %} {% do combined.append(data.nodeid ~ "@" ~ hostname ~ ":9093") %}
{% endfor %} {% endfor %}
{% set kraft_controller_quorum_voters = ','.join(combined) %} {% set kraft_controller_quorum_voters = ','.join(combined) %}
@@ -55,6 +55,15 @@ kafka_sbin_tools:
- group: 960 - group: 960
- file_mode: 755 #} - file_mode: 755 #}
kafka_sbin_jinja_tools:
file.recurse:
- name: /usr/sbin
- source: salt://kafka/tools/sbin_jinja
- user: 960
- group: 960
- file_mode: 755
- template: jinja
kakfa_log_dir: kakfa_log_dir:
file.directory: file.directory:
- name: /opt/so/log/kafka - name: /opt/so/log/kafka
@@ -69,11 +78,10 @@ kafka_data_dir:
- group: 960 - group: 960
- makedirs: True - makedirs: True
{# When docker container is created an added to registry. Update so-kafka-generate-keystore script #}
kafka_keystore_script: kafka_keystore_script:
cmd.script: cmd.script:
- source: salt://kafka/tools/sbin_jinja/so-kafka-generate-keystore - source: salt://kafka/tools/sbin_jinja/so-kafka-generate-keystore
- tempalte: jinja - template: jinja
- cwd: /opt/so - cwd: /opt/so
- defaults: - defaults:
GLOBALS: {{ GLOBALS }} GLOBALS: {{ GLOBALS }}

View File

@@ -8,7 +8,7 @@
. /usr/sbin/so-common . /usr/sbin/so-common
if [ ! -f /etc/pki/kafka.jks ]; then if [ ! -f /etc/pki/kafka.jks ]; then
docker run -v /etc/pki/kafka.p12:/etc/pki/kafka.p12 --name so-kafka-keystore --user root --entrypoint keytool so-kafka -importkeystore -srckeystore /etc/pki/kafka.p12 -srcstoretype PKCS12 -srsstorepass changeit -destkeystore /etc/pki/kafka.jks -deststoretype JKS -deststorepass changeit -alias kafkastore -noprompt docker run -v /etc/pki/kafka.p12:/etc/pki/kafka.p12 --name so-kafka-keystore --user root --entrypoint keytool {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-kafka:{{ GLOBALS.so_version }} -importkeystore -srckeystore /etc/pki/kafka.p12 -srcstoretype PKCS12 -srcstorepass changeit -destkeystore /etc/pki/kafka.jks -deststoretype JKS -deststorepass changeit -noprompt
docker cp so-kafka-keystore:/etc/pki/kafka.jks /etc/pki/kafka.jks docker cp so-kafka-keystore:/etc/pki/kafka.jks /etc/pki/kafka.jks
docker rm so-kafka-keystore docker rm so-kafka-keystore
else else