diff options
| author | Ryan Hallisey <rhallise@redhat.com> | 2016-06-05 09:04:55 -0400 |
|---|---|---|
| committer | Ryan Hallisey <rhallise@redhat.com> | 2016-06-05 12:44:47 -0400 |
| commit | e26e278ee097968b4a5193146368b46b412083ca (patch) | |
| tree | 7d86fbc7608ebb50bebedec61f838b8d8f29ca59 | |
| parent | 2b87c883199628d6fb9e73c2856226e25b305563 (diff) | |
| download | kolla-e26e278ee097968b4a5193146368b46b412083ca.tar.gz kolla-e26e278ee097968b4a5193146368b46b412083ca.zip | |
Add kolla-kubernetes bootstap logic endpoint script
Kolla-kubernetes will setup the endpoints after the bootstrap is
complete.
Closes-bug: #1589282
Change-Id: Ife8d81930af8ef5ad8af166b2f87dae436dc7492
Partially-implements: blueprint kolla-kubernetes-extended-dockerfiles
| -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 |