Merge "devstack: a safeguard for disabled tempurls"
This commit is contained in:
commit
c4d1248035
|
@ -1447,7 +1447,7 @@ function configure_ironic {
|
|||
|
||||
# FIXME(dtantsur): configdrive downloading code does not respect IPA TLS
|
||||
# configuration, not even ipa-insecure.
|
||||
if is_service_enabled swift && ! is_service_enabled tls-proxy; then
|
||||
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
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in New Issue