diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-18 03:15:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-18 03:15:36 +0000 |
| commit | 80c4fbf1eed1f0f97bdcdd04666b056ce34e9c5a (patch) | |
| tree | 42e1685142cb94aacb93104e4a74a808709b8dbd /docker | |
| parent | c6cd15d55c36897f37a22b2f243fffdac6cd7234 (diff) | |
| parent | e26e278ee097968b4a5193146368b46b412083ca (diff) | |
| download | kolla-80c4fbf1eed1f0f97bdcdd04666b056ce34e9c5a.tar.gz kolla-80c4fbf1eed1f0f97bdcdd04666b056ce34e9c5a.zip | |
Merge "Add kolla-kubernetes bootstap logic endpoint script"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/keystone/keystone_bootstrap.sh | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/docker/keystone/keystone_bootstrap.sh b/docker/keystone/keystone_bootstrap.sh index 0d870fd0e..1c822d0d6 100644 --- a/docker/keystone/keystone_bootstrap.sh +++ b/docker/keystone/keystone_bootstrap.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -x + # NOTE(SamYaple): Kolla needs to wraps `keystone-manage bootstrap` to ensure # any change is reported correctly for idempotency. This script will exit with # valid json that can be parsed with information about if the task has failed @@ -23,6 +25,24 @@ function exit_json { echo '{"failed": false, "changed": '"${changed}"'}' } +function kolla_kubernetes { + KUBE_TOKEN=$(</var/run/secrets/kubernetes.io/serviceaccount/token) + bootstrap_url=$(curl -sSk -H "Authorization: Bearer $KUBE_TOKEN" https://$KUBERNETES_SERVICE_HOST:$KUBERNETES_PORT_443_TCPORT/api/v1/namespaces/default/pods | grep /api/v1/namespaces/default/pods/keystone-bootstrap | cut -d '"' -f 4) || true + KEYSTONE_BOOTSTRAPPED=$(curl -sSk -H "Authorization: Bearer $KUBE_TOKEN" https://$KUBERNETES_SERVICE_HOST:$KUBERNETES_PORT_443_TCPORT$bootstrap_url | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["status"]["phase"]') || KEYSTONE_BOOTSTRAPPED='Succeeded' + + if [[ "$KEYSTONE_BOOTSTRAPPED" != "Succeeded" ]]; then + echo "Keystone bootstrapping isn't complete" + exit 1 + fi +} + +#***** KOLLA-KUBERNETES ***** +# TODO: Add a kolla_kubernetes script at build time when templating is complete +if [[ "${!KOLLA_KUBERNETES[@]}" ]]; then + kolla_kubernetes +fi +#***** KOLLA-KUBERNETES ***** + changed="false" keystone_bootstrap=$(keystone-manage bootstrap --bootstrap-username "${USERNAME}" --bootstrap-password "${PASSWORD}" --bootstrap-project-name "${PROJECT}" --bootstrap-role-name "${ROLE}" --bootstrap-admin-url "${ADMIN_URL}" --bootstrap-internal-url "${INTERNAL_URL}" --bootstrap-public-url "${PUBLIC_URL}" --bootstrap-service-name "keystone" --bootstrap-region-id "${REGION}" 2>&1) if [[ $? != 0 ]]; then |