From 37a34869195fc493daf791718f1338501d49fba9 Mon Sep 17 00:00:00 2001
From: Jim Rollenhagen <jim@jimrollenhagen.com>
Date: Wed, 10 Feb 2016 12:47:11 -0800
Subject: [PATCH] Devstack: create endpoint in catalog unconditionally
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
---
devstack/lib/ironic | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index a0c4c7707b..172048b860 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -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
}