From d670f96dc0b801b8be4d715ba96d858e07d4cbd2 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Wed, 16 Dec 2020 11:07:00 -0500 Subject: [PATCH] [fix] Exit on command failure in so-catrust --- salt/elasticsearch/files/scripts/so-catrust | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/salt/elasticsearch/files/scripts/so-catrust b/salt/elasticsearch/files/scripts/so-catrust index aee83a379..d49a29ce4 100644 --- a/salt/elasticsearch/files/scripts/so-catrust +++ b/salt/elasticsearch/files/scripts/so-catrust @@ -18,6 +18,10 @@ {%- set IMAGEREPO = salt['pillar.get']('global:imagerepo') %} {%- set MANAGER = salt['grains.get']('master') %} . /usr/sbin/so-common + +# Exit on errors, since all lines must succeed +set -e + # Check to see if we have extracted the ca cert. if [ ! -f /opt/so/saltstack/local/salt/common/cacerts ]; then docker run -v /etc/pki/ca.crt:/etc/pki/ca.crt --name so-elasticsearchca --user root --entrypoint jdk/bin/keytool {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-elasticsearch:{{ VERSION }} -keystore /etc/pki/ca-trust/extracted/java/cacerts -alias SOSCA -import -file /etc/pki/ca.crt -storepass changeit -noprompt