diff --git a/docker/centos/binary/keystone/Dockerfile b/docker/centos/binary/keystone/Dockerfile index ae03df97eb..11cef4d8f0 100644 --- a/docker/centos/binary/keystone/Dockerfile +++ b/docker/centos/binary/keystone/Dockerfile @@ -18,8 +18,8 @@ RUN chown -R keystone: /var/www/cgi-bin/keystone RUN chmod 755 /var/www/cgi-bin/keystone/* # Add start-up and check scripts -COPY start.sh check.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY start.sh / +COPY config-external.sh /opt/kolla/ # Run the Keystone start script CMD ["/start.sh"] diff --git a/docker/centos/binary/keystone/check.sh b/docker/centos/binary/keystone/check.sh deleted file mode 120000 index fe8e7608c0..0000000000 --- a/docker/centos/binary/keystone/check.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/keystone/check.sh \ No newline at end of file diff --git a/docker/centos/binary/keystone/config-internal.sh b/docker/centos/binary/keystone/config-internal.sh deleted file mode 120000 index fe8d98c1f6..0000000000 --- a/docker/centos/binary/keystone/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/keystone/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/keystone/Dockerfile b/docker/centos/source/keystone/Dockerfile index 995004c149..f83321591d 100644 --- a/docker/centos/source/keystone/Dockerfile +++ b/docker/centos/source/keystone/Dockerfile @@ -24,7 +24,7 @@ RUN cd /keystone \ && chown -R keystone: /var/www/cgi-bin/keystone /var/log/keystone \ && chmod 755 /var/www/cgi-bin/keystone/* -COPY start.sh check.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY start.sh / +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/keystone/check.sh b/docker/centos/source/keystone/check.sh deleted file mode 120000 index fe8e7608c0..0000000000 --- a/docker/centos/source/keystone/check.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/keystone/check.sh \ No newline at end of file diff --git a/docker/centos/source/keystone/config-internal.sh b/docker/centos/source/keystone/config-internal.sh deleted file mode 120000 index fe8d98c1f6..0000000000 --- a/docker/centos/source/keystone/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/keystone/config-internal.sh \ No newline at end of file diff --git a/docker/common/keystone/check.sh b/docker/common/keystone/check.sh deleted file mode 100755 index ca48447848..0000000000 --- a/docker/common/keystone/check.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -RES=0 - -. /openrc -if ! keystone token-get > /dev/null; then - echo "ERROR: keystone token-get failed" >&2 - RES=1 -fi - -exit $RES - diff --git a/docker/common/keystone/config-internal.sh b/docker/common/keystone/config-internal.sh deleted file mode 100755 index d2e9596557..0000000000 --- a/docker/common/keystone/config-internal.sh +++ /dev/null @@ -1,138 +0,0 @@ -#!/bin/bash - -set -e - -# Run Kolla common script -echo "Running the kolla-common script" -. /opt/kolla/kolla-common.sh - -## Check DB connectivity and required variables -echo "Checking connectivity to the DB" -fail_unless_db -echo "Checking for required variables" -check_required_vars ADMIN_TENANT_NAME \ - INIT_KEYSTONE_DB \ - KEYSTONE_ADMIN_PASSWORD \ - KEYSTONE_ADMIN_SERVICE_HOST \ - KEYSTONE_ADMIN_TOKEN \ - KEYSTONE_DB_PASSWORD \ - KEYSTONE_PUBLIC_SERVICE_HOST \ - PUBLIC_IP - -dump_vars - -# Setup the Keystone DB -echo "Setting up Keystone DB" -mysql -h ${MARIADB_SERVICE_HOST} -u root -p"${DB_ROOT_PASSWORD}" mysql < /openrc <