Browse Source

Merge "[k8s] Add missing verify_ca in minion_wc_notify"

changes/09/534309/1
Zuul 3 years ago
committed by Gerrit Code Review
parent
commit
4a3b29aeca
2 changed files with 14 additions and 2 deletions
  1. +7
    -1
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml
  2. +7
    -1
      magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion_software_configs.yaml

+ 7
- 1
magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml View File

@ -359,9 +359,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


+ 7
- 1
magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion_software_configs.yaml View File

@ -294,9 +294,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…
Cancel
Save