commit ce1f133732e298eb1b5d0814d1670756493c2a32
author Jenkins <jenkins@review.openstack.org> Mon Oct 27 01:14:19 2014 +0000
committer Gerrit Code Review <review@openstack.org> Mon Oct 27 01:14:19 2014 +0000
tree bcf72df1df2609c94172578dd3ac237e1748d818
parent e1b2dfe70802ccbf7e8ca6586d7fdfa8a1b9d84f
parent 0f3bafc74edce5fbc091b3cacf27f916ebf04fc7

Merge "Remove copyright footer from RST docs"

lib/ironic

diff --git a/lib/ironic b/lib/ironic
index 1541dcf..0a84e47 100644
--- a/lib/ironic
+++ b/lib/ironic
@@ -281,7 +281,8 @@
         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