Add missing translation for verify_ca
verify_ca should be translated to ""/"-k" before use. Change-Id: I2c51b3cb26ad9a703d5ecfe5090be87ab59dfee6 Partial-Bug: #1663757 (cherry picked from commitba1e7b82fb
) [k8s] Add missing verify_ca in minion_wc_notify Change-Id: I1db23b88097fae77377cce5c56e176e9296f76a2 Partial-Bug: #1663757 (cherry picked from commit1ff85eb970
)
This commit is contained in:
parent
1f4a13e9e8
commit
d0f0830615
|
@ -2,6 +2,12 @@
|
|||
|
||||
. /etc/sysconfig/heat-params
|
||||
|
||||
if [ "$VERIFY_CA" == "True" ]; then
|
||||
VERIFY_CA=""
|
||||
else
|
||||
VERIFY_CA="-k"
|
||||
fi
|
||||
|
||||
WC_NOTIFY_BIN=/usr/local/bin/wc-notify
|
||||
WC_NOTIFY_SERVICE=/etc/systemd/system/wc-notify.service
|
||||
|
||||
|
|
|
@ -360,9 +360,15 @@ resources:
|
|||
str_replace:
|
||||
template: |
|
||||
#!/bin/bash -v
|
||||
wc_notify --data-binary '{"status": "SUCCESS"}'
|
||||
if [ "verify_ca" == "True" ]; then
|
||||
VERIFY_CA=""
|
||||
else
|
||||
VERIFY_CA="-k"
|
||||
fi
|
||||
wc_notify $VERIFY_CA --data-binary '{"status": "SUCCESS"}'
|
||||
params:
|
||||
wc_notify: {get_attr: [minion_wait_handle, curl_cli]}
|
||||
verify_ca: {get_param: verify_ca}
|
||||
|
||||
disable_selinux:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
|
|
|
@ -295,9 +295,15 @@ resources:
|
|||
str_replace:
|
||||
template: |
|
||||
#!/bin/bash -v
|
||||
wc_notify --data-binary '{"status": "SUCCESS"}'
|
||||
if [ "verify_ca" == "True" ]; then
|
||||
VERIFY_CA=""
|
||||
else
|
||||
VERIFY_CA="-k"
|
||||
fi
|
||||
wc_notify $VERIFY_CA --data-binary '{"status": "SUCCESS"}'
|
||||
params:
|
||||
wc_notify: {get_param: wc_curl_cli}
|
||||
verify_ca: {get_param: verify_ca}
|
||||
|
||||
disable_selinux:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
|
|
Loading…
Reference in New Issue