openstack/kolla-ansible
Code Issues Proposed changes

Merge "CI: Fix prometheus-efk scenario with TLS enabled"

Browse Source
This commit is contained in:
Zuul 2022-05-24 14:48:26 +00:00 committed by Gerrit Code Review
commit 118ca739e3
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/run.yml
View File

@ -521,6 +521,8 @@
cmd: test-prometheus-efk.sh cmd: test-prometheus-efk.sh
executable: /bin/bash executable: /bin/bash
chdir: "{{ kolla_ansible_src_dir }}" chdir: "{{ kolla_ansible_src_dir }}"
environment:
TLS_ENABLED: "{{ tls_enabled }}"
when: scenario == "prometheus-efk" when: scenario == "prometheus-efk"
- name: Run test-venus.sh script - name: Run test-venus.sh script

3
tests/test-prometheus-efk.sh
View File

@ -39,6 +39,9 @@ function check_elasticsearch {
--location --location
--fail --fail
) )
if [[ "$TLS_ENABLED" = "True" ]]; then
args+=(--cacert $OS_CACERT)
fi
if ! curl "${args[@]}" $ELASTICSEARCH_URL > $output_path; then if ! curl "${args[@]}" $ELASTICSEARCH_URL > $output_path; then
return 1 return 1
fi fi