openstack
/
ironic
Code Issues Proposed changes

Merge "devstack: do not default to swift if SWIFT_ENABLE_TEMPURLS is False"

This commit is contained in:
Zuul 2020-09-29 19:44:47 +00:00 committed by Gerrit Code Review
parent 1fe43da2fc 365005ba48
commit cb13246998
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/lib/ironic
View File

@ -701,7 +701,7 @@ IRONIC_ANSIBLE_SSH_USER=${IRONIC_ANSIBLE_SSH_USER:-}
# DevStack deployment, as we do not distribute this generated key to subnodes yet. # DevStack deployment, as we do not distribute this generated key to subnodes yet.
IRONIC_ANSIBLE_SSH_KEY=${IRONIC_ANSIBLE_SSH_KEY:-$IRONIC_DATA_DIR/ansible_ssh_key} IRONIC_ANSIBLE_SSH_KEY=${IRONIC_ANSIBLE_SSH_KEY:-$IRONIC_DATA_DIR/ansible_ssh_key}
if is_service_enabled swift; then if is_service_enabled swift && [[ "$SWIFT_ENABLE_TEMPURLS" == "True" ]]; then
IRONIC_DEFAULT_DOWNLOAD_SOURCE=swift IRONIC_DEFAULT_DOWNLOAD_SOURCE=swift
else else
IRONIC_DEFAULT_DOWNLOAD_SOURCE= IRONIC_DEFAULT_DOWNLOAD_SOURCE=
@ -1718,10 +1718,10 @@ function configure_ironic_conductor {
if is_glance_configuration_required; then if is_glance_configuration_required; then
if [[ "$SWIFT_ENABLE_TEMPURLS" == "False" ]] ; then if [[ "$SWIFT_ENABLE_TEMPURLS" == "False" ]] ; then
die $LINENO "SWIFT_ENABLE_TEMPURLS must be True. This is " \ die $LINENO "SWIFT_ENABLE_TEMPURLS must be True. This is " \
"required either because IRONIC_DEPLOY_DRIVER was " \ "required either because " \
"set to some agent_* driver OR configuration of " \ "IRONIC_AGENT_IMAGE_DOWNLOAD_SOURCE was set to swift " \
"Glance with Swift was explicitly requested with " \ "OR configuration of Glance with Swift was explicitly " \
"IRONIC_CONFIGURE_GLANCE_WITH_SWIFT=True" "requested with IRONIC_CONFIGURE_GLANCE_WITH_SWIFT=True"
fi fi
iniset $IRONIC_CONF_FILE glance swift_temp_url_duration 3600 iniset $IRONIC_CONF_FILE glance swift_temp_url_duration 3600
fi fi