Merge "CI: use Swift for configdrive when available"
This commit is contained in:
commit
2403cd6041
@ -1529,9 +1529,7 @@ function configure_ironic {
|
|||||||
# Set fast track options
|
# Set fast track options
|
||||||
iniset $IRONIC_CONF_FILE deploy fast_track $IRONIC_DEPLOY_FAST_TRACK
|
iniset $IRONIC_CONF_FILE deploy fast_track $IRONIC_DEPLOY_FAST_TRACK
|
||||||
|
|
||||||
# FIXME(dtantsur): configdrive downloading code does not respect IPA TLS
|
if is_service_enabled swift && [[ "$SWIFT_ENABLE_TEMPURLS" == "True" ]]; then
|
||||||
# configuration, not even ipa-insecure.
|
|
||||||
if is_service_enabled swift && [[ "$SWIFT_ENABLE_TEMPURLS" == "True" ]] && ! is_service_enabled tls-proxy; then
|
|
||||||
iniset $IRONIC_CONF_FILE deploy configdrive_use_object_store True
|
iniset $IRONIC_CONF_FILE deploy configdrive_use_object_store True
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user