diff options
| author | Zuul <zuul@review.openstack.org> | 2018-06-14 11:32:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-06-14 11:32:08 +0000 |
| commit | b4ff157327e27ce18cc728e1c1e4a8b4872d8b31 (patch) | |
| tree | 9e1876a9a47ab88704e1f8276b93d37f305c8af6 /docker | |
| parent | 139dfefe90f7771e6fcb797b14b1640150d1c2eb (diff) | |
| parent | 5404239dfc1689465eb4f42c6b59a7ff9028d1e6 (diff) | |
| download | kolla-b4ff157327e27ce18cc728e1c1e4a8b4872d8b31.tar.gz kolla-b4ff157327e27ce18cc728e1c1e4a8b4872d8b31.zip | |
Merge "Remove the unused kolla_kubernetes script from keystone"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/keystone/keystone/extend_start.sh | 18 | ||||
| -rw-r--r-- | docker/keystone/keystone/keystone_bootstrap.sh | 18 |
2 files changed, 0 insertions, 36 deletions
diff --git a/docker/keystone/keystone/extend_start.sh b/docker/keystone/keystone/extend_start.sh index 8802dd9d5..0d8d3bc43 100644 --- a/docker/keystone/keystone/extend_start.sh +++ b/docker/keystone/keystone/extend_start.sh @@ -1,16 +1,5 @@ #!/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 @@ -67,10 +56,3 @@ 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 ***** diff --git a/docker/keystone/keystone/keystone_bootstrap.sh b/docker/keystone/keystone/keystone_bootstrap.sh index 803cb46aa..c140e97c7 100644 --- a/docker/keystone/keystone/keystone_bootstrap.sh +++ b/docker/keystone/keystone/keystone_bootstrap.sh @@ -28,24 +28,6 @@ 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 |