diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-16 12:01:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-16 12:01:44 +0000 |
| commit | 07aa95274d3dc280c82edf37fa7b75e4e8e1cfb8 (patch) | |
| tree | 054276c509876cbde0b5e7fdd712c3cfd98655ef /docker | |
| parent | 5f86491bdfd2c1af1908a20b56df4cee927775d4 (diff) | |
| parent | 2b87c883199628d6fb9e73c2856226e25b305563 (diff) | |
| download | kolla-07aa95274d3dc280c82edf37fa7b75e4e8e1cfb8.tar.gz kolla-07aa95274d3dc280c82edf37fa7b75e4e8e1cfb8.zip | |
Merge "Add kolla-kubernetes bootstrap capability to Keystone"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/keystone/extend_start.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/docker/keystone/extend_start.sh b/docker/keystone/extend_start.sh index 594786c1d..992885691 100644 --- a/docker/keystone/extend_start.sh +++ b/docker/keystone/extend_start.sh @@ -1,5 +1,16 @@ #!/bin/bash +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 +} + # NOTE(pbourke): httpd will not clean up after itself in some cases which # results in the container not being able to restart. (bug #1489676, 1557036) if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then @@ -32,3 +43,10 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then fi ARGS="-DFOREGROUND" + +#***** KOLLA-KUBERNETES ***** +# TODO: Add a kolla_kubernetes script at build time when templating is complete +if [[ "${!KOLLA_KUBERNETES[@]}" ]]; then + kolla_kubernetes +fi +#***** KOLLA-KUBERNETES ***** |