Update Redis connection settings #776
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cutwater
reviewed
May 24, 2021
docker/entrypoint.sh
Outdated
| else | ||
| protocol="redis://" | ||
| fi | ||
| if [[ ! -z "${PULP_REDIS_HOST-}" && ! -z "${PULP_REDIS_PASSWORD-}" && |
There was a problem hiding this comment.
Suggested change
| if [[ ! -z "${PULP_REDIS_HOST-}" && ! -z "${PULP_REDIS_PASSWORD-}" && | |
| if [[ ! -z "${PULP_REDIS_HOST:-}" && ! -z "${PULP_REDIS_PASSWORD:-}" && |
Issue: AAH-581
bmclaughlin
force-pushed
the
update-redis-connection-hack
branch
from
61707bb
to
983eff3
Compare
cutwater
approved these changes
Jun 2, 2021
cutwater
reviewed
Jun 2, 2021
docker/entrypoint.sh
Outdated
Comment on lines
105
to
119
| redis_host="${PULP_REDIS_HOST:-}" | ||
| redis_password="${PULP_REDIS_PASSWORD:-}" | ||
| redis_port="${PULP_REDIS_PORT:-}" | ||
| redis_ssl="${PULP_REDIS_SSL:-}" | ||
|
|
||
| if [[ "${redis_host}" != "" && "${redis_port}" != "" && | ||
| "${redis_password}" != "" && "${redis_ssl}" != "" ]]; then | ||
| if [[ ${redis_ssl} == "true" ]]; then | ||
| protocol="rediss://" | ||
| else | ||
| protocol="redis://" | ||
| fi | ||
|
|
||
| if [[ -z "${PULP_REDIS_PASSWORD:-}" ]]; then | ||
| password="" | ||
| else | ||
| password=":${PULP_REDIS_PASSWORD}@" | ||
| PULP_REDIS_URL="${protocol}:${password}@${redis_host}:${redis_port}/0" | ||
| unset PULP_REDIS_HOST PULP_REDIS_PORT PULP_REDIS_PASSWORD | ||
| export PULP_REDIS_URL | ||
| fi |
There was a problem hiding this comment.
redis_connection_hack() {
redis_host="${PULP_REDIS_HOST:-}"
redis_password="${PULP_REDIS_PASSWORD:-}"
redis_port="${PULP_REDIS_PORT:-}"
redis_ssl="${PULP_REDIS_SSL:-}"
if [[ -z "${redis_host}" && -z "${redis_port}"
&& -z "${redis_password}" && -z "${redis_ssl}" ]]; then
return
fi
if [[ "${redis_ssl}" == "true" ]]; then
protocol="rediss://"
else
protocol="redis://"
fi
PULP_REDIS_URL="${protocol}:${redis_password}@${redis_host:-localhost}:${redis_port:-6379}/0"
unset PULP_REDIS_HOST PULP_REDIS_PORT PULP_REDIS_PASSWORD PULP_REDIS_SSL
export PULP_REDIS_URL
}
cutwater
reviewed
Jun 2, 2021
docker/entrypoint.sh
Outdated
| password="" | ||
| else | ||
| password=":${PULP_REDIS_PASSWORD}@" | ||
| PULP_REDIS_URL="${protocol}:${password}@${redis_host}:${redis_port}/0" |
bmclaughlin
force-pushed
the
update-redis-connection-hack
branch
from
983eff3
to
ebf9a59
Compare
|
@cutwater, updated. Successfully tested against dev environment and ephemeral templates. |
Issue: AAH-581
bmclaughlin
force-pushed
the
update-redis-connection-hack
branch
from
ebf9a59
to
c16efd9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update to only populate PULP_REDIS_URL if the relevant PULP_REDIS_* environment variables are set.
Issue: AAH-581