openstack/devstack
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2014-10-24 16:16:30 +00:00 committed by Gerrit Code Review
commit e1b2dfe708
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ironic
View File

@ -281,7 +281,8 @@ function configure_ironic_conductor {
fi fi
iniset $IRONIC_CONF_FILE glance swift_endpoint_url http://${HOST_IP}:8080 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_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_container glance
iniset $IRONIC_CONF_FILE glance swift_temp_url_duration 3600 iniset $IRONIC_CONF_FILE glance swift_temp_url_duration 3600
iniset $IRONIC_CONF_FILE agent heartbeat_timeout 30 iniset $IRONIC_CONF_FILE agent heartbeat_timeout 30