1. devstack
  2. Commit ab50c702a770fa9d7fd0ff533566fc7a1775dde5
Browse code

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

Adam Gandelman authored on 2014/10/23 05:21:22
Showing 1 changed files
lib/ironic
History View file @ ab50c70
... ... 
@@ -281,7 +281,8 @@ function configure_ironic_conductor {
281 281 
         fi
282 282 
         iniset $IRONIC_CONF_FILE glance swift_endpoint_url http://${HOST_IP}:8080
283 283 
         iniset $IRONIC_CONF_FILE glance swift_api_version v1
284 
-        iniset $IRONIC_CONF_FILE glance swift_account AUTH_${SERVICE_TENANT}
284 
+        local tenant_id=$(get_or_create_project $SERVICE_TENANT_NAME)
285 
+        iniset $IRONIC_CONF_FILE glance swift_account AUTH_${tenant_id}
285 286 
         iniset $IRONIC_CONF_FILE glance swift_container glance
286 287 
         iniset $IRONIC_CONF_FILE glance swift_temp_url_duration 3600
287 288 
         iniset $IRONIC_CONF_FILE agent heartbeat_timeout 30