diff options
| author |   Chaoyi Huang <joehuang@huawei.com> | 2017-01-31 01:27:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-01-31 01:27:06 +0000 |
| commit | 32f011b16cb10a6c83fb704436ca5593d7df4085 (patch) | |
| tree | 6af69d3f1cfad62f8413a2663de236af92dd6bb0 /tools/kingbird/install_kingbird.sh | |
| parent | c20680b168f0be600a25a2381bc0db9bc3929b21 (diff) | |
| parent | a7c6ba3b2cb377d283108ff6e93539c4cac86f46 (diff) | |
Merge "Fix endpoint parse create steps"
Diffstat (limited to 'tools/kingbird/install_kingbird.sh')
| -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 |