From ab50c702a770fa9d7fd0ff533566fc7a1775dde5 Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@ubuntu.com>
Date: Wed, 22 Oct 2014 13:21:22 -0700
Subject: [PATCH] Use service tenant id for Ironic agent swift auth

Config of ironic conductor currently references a non-existent variable.
This corrects it by obtaining and using the correct tenant id.

Change-Id: I4340f75b2b22a8fd3fd8dd5cb30d7e91bce4f654
---
 lib/ironic | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ironic b/lib/ironic
index 1541dcfb33..0a84e47ebc 100644
--- a/lib/ironic
+++ b/lib/ironic
@@ -281,7 +281,8 @@ function configure_ironic_conductor {
         fi
         iniset $IRONIC_CONF_FILE glance swift_endpoint_url http://${HOST_IP}:8080
         iniset $IRONIC_CONF_FILE glance swift_api_version v1
-        iniset $IRONIC_CONF_FILE glance swift_account AUTH_${SERVICE_TENANT}
+        local tenant_id=$(get_or_create_project $SERVICE_TENANT_NAME)
+        iniset $IRONIC_CONF_FILE glance swift_account AUTH_${tenant_id}
         iniset $IRONIC_CONF_FILE glance swift_container glance
         iniset $IRONIC_CONF_FILE glance swift_temp_url_duration 3600
         iniset $IRONIC_CONF_FILE agent heartbeat_timeout 30