openstack/ironic
Code Issues Proposed changes

Fix error message in devstack

Browse Source 
When deploy by IPA on devstack, error message without SWIFT_ENABLE_TEMPURLS
is "SWIFT_ENABLE_TEMPURLS must be True to use agent_ssh driver in Ironic.".
But this error occurs not only using agent_ssh driver, but also
using agent_ipmitool.
This patch set fixes this error message to
"SWIFT_ENABLE_TEMPURLS must be True to use agent_* driver in Ironic.".

Change-Id: I21ce85d00485037d5c86dcd28aa1c95d6dc308b7
This commit is contained in:
Yuiko Takada 2016-01-28 12:52:10 +09:00
parent 5661db398a
commit 6bed11503f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/ironic
View File

@ -379,7 +379,7 @@ function configure_ironic_conductor {
if [[ "$SWIFT_ENABLE_TEMPURLS" == "True" ]] ; then if [[ "$SWIFT_ENABLE_TEMPURLS" == "True" ]] ; then
iniset $IRONIC_CONF_FILE glance swift_temp_url_key $SWIFT_TEMPURL_KEY iniset $IRONIC_CONF_FILE glance swift_temp_url_key $SWIFT_TEMPURL_KEY
else else
die $LINENO "SWIFT_ENABLE_TEMPURLS must be True to use agent_ssh driver in Ironic." die $LINENO "SWIFT_ENABLE_TEMPURLS must be True to use agent_* driver in Ironic."
fi fi
iniset $IRONIC_CONF_FILE glance swift_endpoint_url http://${HOST_IP}:${SWIFT_DEFAULT_BIND_PORT:-8080} iniset $IRONIC_CONF_FILE glance swift_endpoint_url http://${HOST_IP}:${SWIFT_DEFAULT_BIND_PORT:-8080}
iniset $IRONIC_CONF_FILE glance swift_api_version v1 iniset $IRONIC_CONF_FILE glance swift_api_version v1