5 files changed, 2 insertions, 81 deletions
diff --git a/docker/centos/binary/barbican/config-internal.sh b/docker/centos/binary/barbican/config-internal.sh
deleted file mode 120000
index 393328cd9..000000000
--- a/docker/centos/binary/barbican/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/barbican/config-internal.sh
-\ No newline at end of file
diff --git a/docker/centos/source/barbican/Dockerfile b/docker/centos/source/barbican/Dockerfile
index 92cbe3fea..0905c8e17 100644
--- a/docker/centos/source/barbican/Dockerfile
+++ b/docker/centos/source/barbican/Dockerfile
@@ -14,6 +14,6 @@ RUN cd /barbican \
     && rm -rf /root/.cache
 
 COPY ./start.sh /start.sh
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/barbican/config-internal.sh b/docker/centos/source/barbican/config-internal.sh
deleted file mode 120000
index 393328cd9..000000000
--- a/docker/centos/source/barbican/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/barbican/config-internal.sh
-\ No newline at end of file
diff --git a/docker/common/barbican/config-internal.sh b/docker/common/barbican/config-internal.sh
deleted file mode 100755
index da5f306a2..000000000
--- a/docker/common/barbican/config-internal.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if ! [ "$BARBICAN_DB_PASSWORD" ]; then
-        BARBICAN_DB_PASSWORD=$(openssl rand -hex 15)
-        export BARBICAN_DB_PASSWORD
-fi
-
-check_required_vars BARBICAN_ADMIN_PASSWORD \
-                    KEYSTONE_ADMIN_SERVICE_HOST \
-                    KEYSTONE_ADMIN_SERVICE_PORT \
-                    KEYSTONE_ADMIN_TOKEN
-fail_unless_db
-fail_unless_os_service_running keystone
-
-mysql -h ${MARIADB_SERVICE_HOST} -u root -p"${DB_ROOT_PASSWORD}" mysql <<EOF
-CREATE DATABASE IF NOT EXISTS ${BARBICAN_DB_NAME};
-GRANT ALL PRIVILEGES ON barbican.* TO
-    '${BARBICAN_DB_USER}'@'%' IDENTIFIED BY '${BARBICAN_DB_PASSWORD}'
-EOF
-
-# config file setup
-crudini --set /etc/barbican/barbican-api.conf \
-    DEFAULT \
-    sql_connection \
-    "mysql://${BARBICAN_DB_USER}:${BARBICAN_DB_PASSWORD}@${MARIADB_SERVICE_HOST}/${BARBICAN_DB_NAME}"
-crudini --set /etc/barbican/barbican-api.conf \
-    DEFAULT \
-    log_dir \
-    "/var/log/barbican/"
-crudini --set /etc/barbican/barbican-api.conf \
-    DEFAULT \
-    log_file \
-    "/var/log/barbican/barbican.log"
-crudini --set /etc/barbican/barbican-api-paste.ini \
-    pipeline:barbican_api \
-    pipeline \
-    "keystone_authtoken context apiapp"
-crudini --set /etc/barbican/barbican-api-paste.ini \
-    filter:keystone_authtoken \
-    auth_host \
-    ${KEYSTONE_ADMIN_SERVICE_HOST}
-crudini --set /etc/barbican/barbican-api-paste.ini \
-    filter:keystone_authtoken \
-    auth_port \
-    ${KEYSTONE_ADMIN_SERVICE_PORT}
-crudini --set /etc/barbican/barbican-api-paste.ini \
-    filter:keystone_authtoken \
-    auth_protocol \
-    ${KEYSTONE_AUTH_PROTOCOL}
-crudini --set /etc/barbican/barbican-api-paste.ini \
-    filter:keystone_authtoken \
-    admin_tenant_name \
-    ${ADMIN_TENANT_NAME}
-crudini --set /etc/barbican/barbican-api-paste.ini \
-    filter:keystone_authtoken \
-    admin_user \
-    ${BARBICAN_KEYSTONE_USER}
-crudini --set /etc/barbican/barbican-api-paste.ini \
-    filter:keystone_authtoken \
-    admin_password \
-    ${BARBICAN_KEYSTONE_USER}
-
-# create the required keystone entities for barbican
-export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
-export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0"
-
-keystone user-get ${BARBICAN_KEYSTONE_USER} > /dev/null 2>&1 || /bin/keystone user-create --name ${BARBICAN_KEYSTONE_USER} --pass ${BARBICAN_ADMIN_PASSWORD}
-
-keystone role-get observer > /dev/null 2>&1 || /bin/keystone role-create --name observer
-keystone role-get creator > /dev/null 2>&1 || /bin/keystone role-create --name creator
-
-keystone user-get ${BARBICAN_KEYSTONE_USER} > /dev/null 2>&1 || /bin/keystone user-role-add --user ${BARBICAN_KEYSTONE_USER} --role admin --tenant ${ADMIN_TENANT_NAME}
-
-# launch Barbican using uwsgi
-exec uwsgi --master --emperor /etc/barbican/vassals
diff --git a/docker/common/barbican/start.sh b/docker/common/barbican/start.sh
index c0a32e00d..589773540 100755
--- a/docker/common/barbican/start.sh
+++ b/docker/common/barbican/start.sh
@@ -8,7 +8,7 @@ ARGS="--master --emperor"
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Config-internal script exec out of this function, it does not return here.
+# Execute config strategy
 set_configs
 
 # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases