diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-16 12:00:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-16 12:00:20 +0000 |
| commit | 5f86491bdfd2c1af1908a20b56df4cee927775d4 (patch) | |
| tree | eb25eb00f3658794a15d23a1aecdd31579597910 | |
| parent | 2cb0f445bba72d5b085856deb57a5e48c5832ca9 (diff) | |
| parent | 994d1e50a5bc53687cb5224f6de70451bf15bde8 (diff) | |
| download | kolla-5f86491bdfd2c1af1908a20b56df4cee927775d4.tar.gz kolla-5f86491bdfd2c1af1908a20b56df4cee927775d4.zip | |
Merge "Add kolla-kubernetes bootstrap capability to mariadb"
| -rw-r--r-- | docker/mariadb/extend_start.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/docker/mariadb/extend_start.sh b/docker/mariadb/extend_start.sh index e5d9632b9..629b3a98c 100644 --- a/docker/mariadb/extend_start.sh +++ b/docker/mariadb/extend_start.sh @@ -18,6 +18,17 @@ function bootstrap_db { mysqladmin -uroot -p"${DB_ROOT_PASSWORD}" shutdown } +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/mariadb-bootstrap | cut -d '"' -f 4) || true + MARIADB_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"]') || MARIADB_BOOTSTRAPPED='Succeeded' + + if [[ "$MARIADB_BOOTSTRAPPED" != "Succeeded" ]]; then + echo "Mariadb bootstrapping isn't complete" + exit 1 + fi +} + # Only update permissions if permissions need to be updated if [[ $(stat -c %U:%G /var/lib/mysql) != "mysql:mysql" ]]; then sudo chown mysql: /var/lib/mysql @@ -41,3 +52,10 @@ fi if [[ "${!BOOTSTRAP_ARGS[@]}" ]]; then ARGS="${BOOTSTRAP_ARGS}" 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 ***** |