From dd3481be97fe51aa80dd92596ef8c727d4346d21 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Tue, 8 Sep 2015 09:04:24 +0200 Subject: [PATCH] Don't set keystone as auth if not enabled We create keystone accounts conditionally depending on whether keystone was enabled or not. Do the same when configuring the auth strategy in Zaqar. Change-Id: Ic3a99e24099dbe32a4435dbb092d09a7fae7dc2f --- devstack/plugin.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 8da301a37..6ac0f239d 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -119,9 +119,12 @@ function configure_zaqar { iniset $ZAQAR_CONF DEFAULT verbose True iniset $ZAQAR_CONF DEFAULT unreliable True iniset $ZAQAR_CONF DEFAULT admin_mode True - iniset $ZAQAR_CONF DEFAULT auth_strategy keystone iniset $ZAQAR_CONF signed_url secret_key notreallysecret + if is_service_enabled key; then + iniset $ZAQAR_CONF DEFAULT auth_strategy keystone + fi + iniset $ZAQAR_CONF storage message_pipeline zaqar.notification.notifier # Enable pooling by default for now