1. devstack
  2. Commit e1b2dfe70802ccbf7e8ca6586d7fdfa8a1b9d84f
Browse code

Merge "Use service tenant id for Ironic agent swift auth"

Jenkins authored on 2014/10/25 01:16:30
Showing 1 changed files
lib/ironic
History View file @ e1b2dfe
... ... 
@@ -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