openstack/kolla
Code Issues Proposed changes

Fix disabling of curlrc in healthcheck_curl

Browse Source 
The -q (aka --disable) option only works if it is the first parameter on
the command line.

Change-Id: Ia9ab0bdc95e658c17e5be5abefcf96f1c05ee84f
Closes-Bug: #1967272
This commit is contained in:
Pierre Riteau
2022-03-31 12:24:04 +02:00
parent 497b40fe5a
commit 196b742ba2
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/healthcheck_curl
View File

@@ -5,7 +5,7 @@
: ${HEALTHCHECK_CURL_OUTPUT:='/dev/null'} : ${HEALTHCHECK_CURL_OUTPUT:='/dev/null'}
export NSS_SDB_USE_CACHE=no export NSS_SDB_USE_CACHE=no
curl -g -k -q -s -S --fail -o "${HEALTHCHECK_CURL_OUTPUT}" \ curl -q -g -k -s -S --fail -o "${HEALTHCHECK_CURL_OUTPUT}" \
--max-time "${HEALTHCHECK_CURL_MAX_TIME}" \ --max-time "${HEALTHCHECK_CURL_MAX_TIME}" \
--user-agent "${HEALTHCHECK_CURL_USER_AGENT}" \ --user-agent "${HEALTHCHECK_CURL_USER_AGENT}" \
--write-out "${HEALTHCHECK_CURL_WRITE_OUT}" \ --write-out "${HEALTHCHECK_CURL_WRITE_OUT}" \

5
releasenotes/notes/healthcheck-curl-disable-curlrc-0f85aad47379e2a5.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
fixes:
- |
Fixes disabling the use of the ``curlrc`` configuration file in
``healthcheck_curl``. `LP#1967272 <https://launchpad.net/bugs/1967272>`__