openstack/ironic
Code Issues Proposed changes

Devstack: create endpoint in catalog unconditionally

Browse Source 
The KEYSTONE_CATALOG_BACKEND is being deprecated, and as such we should
just always create the ironic endpoint in the service catalog. Remove
the conditional here.

See also:
http://lists.openstack.org/pipermail/openstack-dev/2016-February/086272.html

Change-Id: I2d47ebe13a23bd39648cc09c72dc975ccadd64d4
This commit is contained in:
Jim Rollenhagen 2016-02-10 12:47:11 -08:00
parent 4fe84bcaf7
commit 37a3486919
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devstack/lib/ironic
View File

@ -436,15 +436,12 @@ function create_ironic_accounts {
# NOTE(Shrews): This user MUST have admin level privileges!
create_service_user "ironic" "admin"
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
get_or_create_service "ironic" "baremetal" "Ironic baremetal provisioning service"
get_or_create_endpoint "baremetal" \
"$REGION_NAME" \
"$IRONIC_SERVICE_PROTOCOL://$IRONIC_HOSTPORT" \
"$IRONIC_SERVICE_PROTOCOL://$IRONIC_HOSTPORT" \
"$IRONIC_SERVICE_PROTOCOL://$IRONIC_HOSTPORT"
fi
get_or_create_service "ironic" "baremetal" "Ironic baremetal provisioning service"
get_or_create_endpoint "baremetal" \
"$REGION_NAME" \
"$IRONIC_SERVICE_PROTOCOL://$IRONIC_HOSTPORT" \
"$IRONIC_SERVICE_PROTOCOL://$IRONIC_HOSTPORT" \
"$IRONIC_SERVICE_PROTOCOL://$IRONIC_HOSTPORT"
fi
}