Skip to content

Commit fc203f1

Browse files
authored
[ANSIENG-5740] | Fix lint warnings (#2366)
1 parent d288bcd commit fc203f1

File tree

9 files changed

+14
-11
lines changed

9 files changed

+14
-11
lines changed

roles/common/tasks/config_validations.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
shell:
44
cmd: set -o pipefail; openssl pkey -pubout | openssl md5
55
stdin: "{{ lookup('file', ssl_key_filepath) }}"
6-
executable: /bin/bash
6+
executable: "{{ shell_executable }}"
77
register: key_hash_local
88
delegate_to: localhost
99
changed_when: false
@@ -31,7 +31,7 @@
3131
shell:
3232
cmd: set -o pipefail; openssl pkey -pubout | openssl md5
3333
stdin: "{{ remote_key['results'][group_idx].content | b64decode }}"
34-
executable: /bin/bash
34+
executable: "{{ shell_executable }}"
3535
register: key_hash_remote
3636
changed_when: false
3737
when:
@@ -48,7 +48,7 @@
4848
shell:
4949
cmd: set -o pipefail; openssl x509 -noout -pubkey | openssl md5
5050
stdin: "{{ lookup('file', ssl_signed_cert_filepath) }}"
51-
executable: /bin/bash
51+
executable: "{{ shell_executable }}"
5252
register: cert_hash_local
5353
delegate_to: localhost
5454
changed_when: false
@@ -76,7 +76,7 @@
7676
shell:
7777
cmd: set -o pipefail; openssl x509 -noout -pubkey | openssl md5
7878
stdin: "{{ remote_cert['results'][group_idx].content | b64decode }}"
79-
executable: /bin/bash
79+
executable: "{{ shell_executable }}"
8080
register: cert_hash_remote
8181
changed_when: false
8282
when:

roles/common/tasks/masterkey.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
--local-secrets-file /tmp/security.properties \
1414
--passphrase @/tmp/passphrase.txt | awk '/Master/{print $5}'
1515
args:
16-
executable: /bin/bash
16+
executable: "{{ shell_executable }}"
1717
register: masterkey
1818
changed_when: true
1919
diff: "{{ not mask_sensitive_diff|bool }}"

roles/kafka_broker/tasks/set_principal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
| cut -c2- \
4242
| sed 's/\s*,\s*/,/g'
4343
args:
44-
executable: /bin/bash
44+
executable: "{{ shell_executable }}"
4545
register: distinguished_name_from_keystore
4646
changed_when: false
4747
when:

roles/kafka_controller/tasks/health_check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
{{ binary_base_path }}/bin/kafka-metadata-quorum --bootstrap-server {{inventory_hostname}}:{{kafka_controller_port}} \
1818
--command-config {{kafka_controller.client_config_file}} describe --replication | grep -v Observer | awk '{print $2}'
1919
args:
20-
executable: /bin/bash
20+
executable: "{{ shell_executable }}"
2121
environment:
2222
KAFKA_OPTS: "-Xlog:all=error -XX:+IgnoreUnrecognizedVMOptions {% if kerberos_client_config_file_dest != '/etc/krb5.conf' %}-Djava.security.krb5.conf={{kerberos_client_config_file_dest}}{% endif %}"
2323
register: leo

roles/kafka_controller/tasks/set_principal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
| cut -c2- \
4242
| sed 's/\s*,\s*/,/g'
4343
args:
44-
executable: /bin/bash
44+
executable: "{{ shell_executable }}"
4545
register: distinguished_name_from_keystore
4646
changed_when: false
4747
when:

roles/ksql/tasks/set_principal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
| sed 's/^.*CN=//' \
4040
| cut -d "," -f1
4141
args:
42-
executable: /bin/bash
42+
executable: "{{ shell_executable }}"
4343
register: distinguished_name_from_keystore
4444
changed_when: false
4545
when:

roles/ssl/tasks/export_certs_from_keystore_and_truststore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
| cut -d ":" -f2 \
2020
| cut -c2-
2121
args:
22-
executable: /bin/bash
22+
executable: "{{ shell_executable }}"
2323
register: keytool_type
2424
changed_when: false
2525
no_log: "{{mask_secrets|bool}}"

roles/ssl/tasks/import_ca_chain.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
set -o pipefail
1111
cat {{ca_cert_path}} | awk 'split_after==1{n++;split_after=0} /-----END CERTIFICATE-----/ {split_after=1} {print > ("{{ ssl_file_dir_final }}/generation/trustCAs/ca" n ".pem")}'
1212
args:
13-
executable: /bin/bash
13+
executable: "{{ shell_executable }}"
1414
register: split_ca_result
1515
changed_when: split_ca_result.rc == 0
1616

roles/variables/defaults/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ mask_sensitive_logs: "{{mask_secrets}}"
2525
### Boolean to mask output generated by diff flag
2626
mask_sensitive_diff: true
2727

28+
### Path to bash executable for shell tasks that require pipefail. Override if bash is at a different location on your systems.
29+
shell_executable: /bin/bash
30+
2831
### To copy from Ansible control host or download
2932
jolokia_url_remote: true
3033

0 commit comments

Comments
 (0)