diff options
author | Dimitri Mazmanov <dimitri.mazmanov@ericsson.com> | 2017-01-26 14:55:46 +0100 |
---|---|---|
committer | Dimitri Mazmanov <dimitri.mazmanov@ericsson.com> | 2017-01-26 14:58:45 +0100 |
commit | a7c6ba3b2cb377d283108ff6e93539c4cac86f46 (patch) | |
tree | ca33f993584d1e5f5510e0d2915b1b9ef3caaa9d | |
parent | e7fe8818ece870b88556f7bad78b589b26d19151 (diff) |
Fix endpoint parse create steps
Due to udpated openstack client the CLI commands for endpoints need
update.
Change-Id: I7498e8366cd95904333090eb5dc36fec57de8f8f
Signed-off-by: Dimitri Mazmanov <dimitri.mazmanov@ericsson.com>
JIRA: MULTISITE-33
-rwxr-xr-x[-rw-r--r--] | tools/kingbird/install_kingbird.sh | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tools/kingbird/install_kingbird.sh b/tools/kingbird/install_kingbird.sh index 0f67d91..8fb7a32 100644..100755 --- a/tools/kingbird/install_kingbird.sh +++ b/tools/kingbird/install_kingbird.sh @@ -17,9 +17,9 @@ set -o pipefail source openrc # Endpoints. Dynamically get IP addresses from another service (keystone) -KINGBIRD_PUBLIC_URL=$(openstack endpoint list --long | grep keystone | cut -d '|' -f 6 | cut -d '/' -f 3 | cut -d ':' -f 1) -KINGBIRD_ADMIN_URL=$(openstack endpoint list --long | grep keystone | cut -d '|' -f 7 | cut -d '/' -f 3 | cut -d ':' -f 1) -KINGBIRD_INTERNAL_URL=$(openstack endpoint list --long | grep keystone | cut -d '|' -f 7 | cut -d '/' -f 3 | cut -d ':' -f 1) +KINGBIRD_PUBLIC_URL=$(openstack endpoint list | grep keystone | grep public | cut -d '|' -f 8 | cut -d '/' -f 3 | cut -d ':' -f 1) +KINGBIRD_ADMIN_URL=$(openstack endpoint list | grep keystone | grep admin | cut -d '|' -f 8 | cut -d '/' -f 3 | cut -d ':' -f 1) +KINGBIRD_INTERNAL_URL=$(openstack endpoint list | grep keystone | grep internal | cut -d '|' -f 8 | cut -d '/' -f 3 | cut -d ':' -f 1) KINGBIRD_PORT=8118 KINGBIRD_VERSION='v1.0' # MySQL @@ -116,11 +116,10 @@ if [ $? -eq 0 ]; then else echo "Creating Kingbird endpoints.." openstack service create --name=kingbird --description="Kingbird" multisite - openstack endpoint create kingbird \ - --publicurl http://${KINGBIRD_PUBLIC_URL}:${KINGBIRD_PORT}/${KINGBIRD_VERSION} \ - --adminurl http://${KINGBIRD_ADMIN_URL}:${KINGBIRD_PORT}/${KINGBIRD_VERSION} \ - --internalurl http://${KINGBIRD_INTERNAL_URL}:${KINGBIRD_PORT}/${KINGBIRD_VERSION} \ - --region ${OS_REGION_NAME} + + openstack endpoint create kingbird public http://${KINGBIRD_PUBLIC_URL}:${KINGBIRD_PORT}/${KINGBIRD_VERSION} --region ${OS_REGION_NAME} + openstack endpoint create kingbird admin http://${KINGBIRD_ADMIN_URL}:${KINGBIRD_PORT}/${KINGBIRD_VERSION} --region ${OS_REGION_NAME} + openstack endpoint create kingbird internal http://${KINGBIRD_INTERNAL_URL}:${KINGBIRD_PORT}/${KINGBIRD_VERSION} --region ${OS_REGION_NAME} fi set -e |