diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-01 10:25:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-01 10:25:18 +0000 |
| commit | 089899d8804fbc9f5d2509fe6c50a7a25f45231f (patch) | |
| tree | db35aa6021f748d8dd26c9e49c9190ba87f0e4cb | |
| parent | 0a8fe7ba2133cf688d9e399c88b6fcd929d92b15 (diff) | |
| parent | 196b742ba271fd7e3521448f83e8a2914f5c7dc6 (diff) | |
| download | kolla-089899d8804fbc9f5d2509fe6c50a7a25f45231f.tar.gz kolla-089899d8804fbc9f5d2509fe6c50a7a25f45231f.zip | |
Merge "Fix disabling of curlrc in healthcheck_curl"
| -rwxr-xr-x | docker/base/healthcheck_curl | 2 | ||||
| -rw-r--r-- | releasenotes/notes/healthcheck-curl-disable-curlrc-0f85aad47379e2a5.yaml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/docker/base/healthcheck_curl b/docker/base/healthcheck_curl index 2ef8538ba..6df232fe8 100755 --- a/docker/base/healthcheck_curl +++ b/docker/base/healthcheck_curl @@ -5,7 +5,7 @@ : ${HEALTHCHECK_CURL_OUTPUT:='/dev/null'} 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}" \ --user-agent "${HEALTHCHECK_CURL_USER_AGENT}" \ --write-out "${HEALTHCHECK_CURL_WRITE_OUT}" \ diff --git a/releasenotes/notes/healthcheck-curl-disable-curlrc-0f85aad47379e2a5.yaml b/releasenotes/notes/healthcheck-curl-disable-curlrc-0f85aad47379e2a5.yaml new file mode 100644 index 000000000..c1c00d6ce --- /dev/null +++ b/releasenotes/notes/healthcheck-curl-disable-curlrc-0f85aad47379e2a5.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes disabling the use of the ``curlrc`` configuration file in + ``healthcheck_curl``. `LP#1967272 <https://launchpad.net/bugs/1967272>`__ |