Skip to content

Commit 97bde6c

Browse files
authored
[ANSIENG-5798] | Revert pipefail changes (#2420)
1 parent 586691f commit 97bde6c

File tree

14 files changed

+8
-18
lines changed

14 files changed

+8
-18
lines changed

docs/VARIABLES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Default: true
5454

5555
### shell_executable
5656

57-
Path to bash executable for shell tasks that require pipefail. Override if bash is at a different location on your systems.
57+
Path to bash executable for shell tasks. Override if bash is at a different location on your systems.
5858

5959
Default: /bin/bash
6060

roles/common/tasks/cert_principal_extract.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
# we dont need to handle fips seperately as in fips bouncy castle is used but normal jks keystore is also present.
99
# In case we try to fetch from bouncy castle keystore we need to handle each component differently as it is only present on kafka others dont have it
1010
shell: |
11-
set -o pipefail
1211
keytool -list -keystore {{keystore_path}} \
1312
-storepass {{keystore_storepass}} \
1413
{% if fips_enabled|bool and ('kafka_controller' in group_names or 'kafka_broker' in group_names) %}

roles/common/tasks/config_validations.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
- name: Retrieve SSL public key hash from private key on Local Host
33
shell:
4-
cmd: set -o pipefail; openssl pkey -pubout | openssl sha256
4+
cmd: openssl pkey -pubout | openssl sha256
55
stdin: "{{ lookup('file', ssl_key_filepath) }}"
66
executable: "{{ shell_executable }}"
77
register: key_hash_local
@@ -29,7 +29,7 @@
2929

3030
- name: Retrieve SSL public key Hash from private key on Remote Host
3131
shell:
32-
cmd: set -o pipefail; openssl pkey -pubout | openssl sha256
32+
cmd: openssl pkey -pubout | openssl sha256
3333
stdin: "{{ remote_key['results'][group_idx].content | b64decode }}"
3434
executable: "{{ shell_executable }}"
3535
register: key_hash_remote
@@ -46,7 +46,7 @@
4646

4747
- name: Retrieve SSL public key hash from X509 certificate on Local Host
4848
shell:
49-
cmd: set -o pipefail; openssl x509 -noout -pubkey | openssl sha256
49+
cmd: openssl x509 -noout -pubkey | openssl sha256
5050
stdin: "{{ lookup('file', ssl_signed_cert_filepath) }}"
5151
executable: "{{ shell_executable }}"
5252
register: cert_hash_local
@@ -74,7 +74,7 @@
7474

7575
- name: Retrieve SSL public key hash from X509 certificate on Remote Host
7676
shell:
77-
cmd: set -o pipefail; openssl x509 -noout -pubkey | openssl sha256
77+
cmd: openssl x509 -noout -pubkey | openssl sha256
7878
stdin: "{{ remote_cert['results'][group_idx].content | b64decode }}"
7979
executable: "{{ shell_executable }}"
8080
register: cert_hash_remote
@@ -339,4 +339,4 @@
339339
that:
340340
- not (control_center_next_gen_dependency_alertmanager_ssl_enabled | bool and control_center_next_gen_dependency_alertmanager_mtls_enabled | bool and control_center_next_gen_dependency_alertmanager_basic_auth_enabled | bool)
341341
fail_msg: "Alertmanager SSL, mTLS, and Basic Auth cannot all be enabled simultaneously."
342-
tags: validate
342+
tags: validate

roles/common/tasks/masterkey.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
- name: Generate Master Encryption Key and File
99
tags: masterkey
1010
shell: |
11-
set -o pipefail
1211
{{ confluent_cli_path }} secret master-key generate \
1312
--local-secrets-file /tmp/security.properties \
1413
--passphrase @/tmp/passphrase.txt | awk '/Master/{print $5}'

roles/common/tasks/rbac_setup.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343

4444
- name: Get Kafka Cluster ID from Zookeeper
4545
shell: >
46-
set -o pipefail;
4746
{{ binary_base_path }}/bin/zookeeper-shell {{ groups['zookeeper'][0] }}:{{zookeeper_client_port}} \
4847
{% if zookeeper_ssl_enabled|bool %}-zk-tls-config-file {{ kafka_broker.zookeeper_tls_client_config_file \
4948
if kafka_broker_secrets_protection_enabled else kafka_broker.config_file }}{% endif %} \

roles/common/tasks/update_log4j.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
- name: Register Appenders
3333
shell: |
34-
set -o pipefail
3534
grep RollingFileAppender {{log4j_file}} | cut -d '=' -f 1 | cut -d '.' -f 3
3635
args:
3736
executable: /bin/bash

roles/control_center_next_gen/tasks/health_check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
- validation
146146

147147
- name: Validate Cron Jobs for Logrotate
148-
shell: set -o pipefail && crontab -l | grep -c "{{ item }}"
148+
shell: crontab -l | grep -c "{{ item }}"
149149
args:
150150
executable: "{{ shell_executable }}"
151151
register: logrotate_cron_validation

roles/kafka_broker/tasks/set_principal.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
# Extract DNAME from line
2727
# Remove spaces after commas
2828
shell: |
29-
set -o pipefail
3029
keytool -list -keystore {{kb_keystore_path}} \
3130
-storepass {{kb_keystore_storepass}} \
3231
{% if fips_enabled|bool %}

roles/kafka_controller/tasks/health_check.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#Registers LEO of controllers only if Metadata Quorum passed in the above task
4040
- name: Register LogEndOffset
4141
shell: |
42-
set -o pipefail
4342
{{ binary_base_path }}/bin/kafka-metadata-quorum --bootstrap-{{bootstrap_server_or_controller}} {{server_hostname}}:{{server_port}} \
4443
--command-config {{kafka_controller.client_config_file}} describe --replication | grep -v Observer | awk '{print $3}'
4544
args:

roles/kafka_controller/tasks/set_principal.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
# Extract DNAME from line
2727
# Remove spaces after commas
2828
shell: |
29-
set -o pipefail
3029
keytool -list -keystore {{kc_keystore_path}} \
3130
-storepass {{kc_keystore_storepass}} \
3231
{% if fips_enabled|bool %}

0 commit comments

Comments
 (0)