From 6bed11503f54592d6827af378351215806760fab Mon Sep 17 00:00:00 2001
From: Yuiko Takada <takada-yuiko@mxn.nes.nec.co.jp>
Date: Thu, 28 Jan 2016 12:52:10 +0900
Subject: [PATCH] Fix error message in devstack
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
---
devstack/lib/ironic | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 72797c6222..8bef112419 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -379,7 +379,7 @@ function configure_ironic_conductor {
if [[ "$SWIFT_ENABLE_TEMPURLS" == "True" ]] ; then
iniset $IRONIC_CONF_FILE glance swift_temp_url_key $SWIFT_TEMPURL_KEY
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
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