diff --git a/docker/centos/binary/heat/heat-api-cfn/Dockerfile b/docker/centos/binary/heat/heat-api-cfn/Dockerfile
index 450363bc045ec3d51eada29c8f5834897a7ca146..bfd2fe0bc2cdb6aa142924ea0d42e46e7d057124 100644
--- a/docker/centos/binary/heat/heat-api-cfn/Dockerfile
+++ b/docker/centos/binary/heat/heat-api-cfn/Dockerfile
@@ -6,9 +6,7 @@ RUN yum -y install \
python-openstackclient \
&& yum clean all
-COPY ./start.sh /start.sh
-COPY ./check.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/binary/heat/heat-api-cfn/check.sh b/docker/centos/binary/heat/heat-api-cfn/check.sh
deleted file mode 120000
index 68fce28bf145f1852ade1f54ba29a7f68bae73a1..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-api-cfn/check.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api-cfn/check.sh
\ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-api-cfn/config-internal.sh b/docker/centos/binary/heat/heat-api-cfn/config-internal.sh
deleted file mode 120000
index 280210245edd1988df4eb16bb779ff1ea3adf2dc..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-api-cfn/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api-cfn/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-api/Dockerfile b/docker/centos/binary/heat/heat-api/Dockerfile
index ac0e18772303d943724652b556041f0db1520708..6f77186831f125881e237c168d44e6d36aabf384 100644
--- a/docker/centos/binary/heat/heat-api/Dockerfile
+++ b/docker/centos/binary/heat/heat-api/Dockerfile
@@ -8,9 +8,7 @@ RUN yum -y install \
python-openstackclient \
&& yum clean all
-COPY ./start.sh /start.sh
-COPY ./check.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/binary/heat/heat-api/check.sh b/docker/centos/binary/heat/heat-api/check.sh
deleted file mode 120000
index 1e72d2e2c1ad91af162327cd174772ab04e38e1f..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-api/check.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api/check.sh
\ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-api/config-internal.sh b/docker/centos/binary/heat/heat-api/config-internal.sh
deleted file mode 120000
index e13addbc92e16088113ab81173c7fec59a26359a..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-api/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-base/Dockerfile b/docker/centos/binary/heat/heat-base/Dockerfile
old mode 100755
new mode 100644
index 8fa08858e83c7bf5c48f4f51247054242d95ec3d..f66e130e3c1093643d067f8189db7bee6df584f5
--- a/docker/centos/binary/heat/heat-base/Dockerfile
+++ b/docker/centos/binary/heat/heat-base/Dockerfile
@@ -4,5 +4,3 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \
python-oslo-reports \
&& yum clean all
-
-COPY config-heat.sh /opt/kolla/
diff --git a/docker/centos/binary/heat/heat-base/config-heat.sh b/docker/centos/binary/heat/heat-base/config-heat.sh
deleted file mode 120000
index 8b4e89797881f26bf1108cabea59004dafc29e87..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-base/config-heat.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-base/config-heat.sh
\ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-engine/Dockerfile b/docker/centos/binary/heat/heat-engine/Dockerfile
index 83f2eba241dd204da1ee2d6b59130905a064f8c4..37cf7fb2c1b3770c9ac7bbe321eff8506525c3ab 100644
--- a/docker/centos/binary/heat/heat-engine/Dockerfile
+++ b/docker/centos/binary/heat/heat-engine/Dockerfile
@@ -9,8 +9,7 @@ RUN yum -y install \
openstack-heat-engine \
&& yum clean all
-COPY ./start.sh /start.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/binary/heat/heat-engine/config-internal.sh b/docker/centos/binary/heat/heat-engine/config-internal.sh
deleted file mode 120000
index b79835025c78837fa645c4b57b8df8e1faab42bf..0000000000000000000000000000000000000000
--- a/docker/centos/binary/heat/heat-engine/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-engine/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api-cfn/Dockerfile b/docker/centos/source/heat/heat-api-cfn/Dockerfile
index 30ffbeac8cb0d62e9fa93a95ef17ca6d88b4da71..fb0d48115191a7334171c882c99f9cf738055290 100644
--- a/docker/centos/source/heat/heat-api-cfn/Dockerfile
+++ b/docker/centos/source/heat/heat-api-cfn/Dockerfile
@@ -1,9 +1,7 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
-ADD ./start.sh /start.sh
-ADD ./check.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/heat/heat-api-cfn/check.sh b/docker/centos/source/heat/heat-api-cfn/check.sh
deleted file mode 120000
index 68fce28bf145f1852ade1f54ba29a7f68bae73a1..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-api-cfn/check.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api-cfn/check.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api-cfn/config-internal.sh b/docker/centos/source/heat/heat-api-cfn/config-internal.sh
deleted file mode 120000
index 280210245edd1988df4eb16bb779ff1ea3adf2dc..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-api-cfn/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api-cfn/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api/Dockerfile b/docker/centos/source/heat/heat-api/Dockerfile
index 30ffbeac8cb0d62e9fa93a95ef17ca6d88b4da71..fb0d48115191a7334171c882c99f9cf738055290 100644
--- a/docker/centos/source/heat/heat-api/Dockerfile
+++ b/docker/centos/source/heat/heat-api/Dockerfile
@@ -1,9 +1,7 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
-ADD ./start.sh /start.sh
-ADD ./check.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/heat/heat-api/check.sh b/docker/centos/source/heat/heat-api/check.sh
deleted file mode 120000
index 1e72d2e2c1ad91af162327cd174772ab04e38e1f..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-api/check.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api/check.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api/config-internal.sh b/docker/centos/source/heat/heat-api/config-internal.sh
deleted file mode 120000
index e13addbc92e16088113ab81173c7fec59a26359a..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-api/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-base/Dockerfile b/docker/centos/source/heat/heat-base/Dockerfile
old mode 100755
new mode 100644
index 52647a49e82473681ca4f44ee725fa81abe99172..4ef6f222c86e3c6507b2df379f4218cdf422f246
--- a/docker/centos/source/heat/heat-base/Dockerfile
+++ b/docker/centos/source/heat/heat-base/Dockerfile
@@ -11,7 +11,3 @@ RUN cd /heat \
&& mkdir /etc/heat /var/log/heat \
&& cp -r /heat/etc/* /etc/heat/ \
&& rm -rf /root/.cache
-
-COPY config-heat.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/heat/heat-base/config-heat.sh b/docker/centos/source/heat/heat-base/config-heat.sh
deleted file mode 120000
index 8b4e89797881f26bf1108cabea59004dafc29e87..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-base/config-heat.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-base/config-heat.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-engine/Dockerfile b/docker/centos/source/heat/heat-engine/Dockerfile
index 9af746142f555209c0c7ea051c4ec05df53456d9..fb0d48115191a7334171c882c99f9cf738055290 100644
--- a/docker/centos/source/heat/heat-engine/Dockerfile
+++ b/docker/centos/source/heat/heat-engine/Dockerfile
@@ -1,8 +1,7 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
-ADD ./start.sh /start.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/heat/heat-engine/config-internal.sh b/docker/centos/source/heat/heat-engine/config-internal.sh
deleted file mode 120000
index b79835025c78837fa645c4b57b8df8e1faab42bf..0000000000000000000000000000000000000000
--- a/docker/centos/source/heat/heat-engine/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-engine/config-internal.sh
\ No newline at end of file
diff --git a/docker/common/heat/heat-api-cfn/check.sh b/docker/common/heat/heat-api-cfn/check.sh
deleted file mode 100755
index ee03dc6d23e3488433ffda423f567aabda4f9e73..0000000000000000000000000000000000000000
--- a/docker/common/heat/heat-api-cfn/check.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-RES=0
-
-. /openrc
-if ! keystone token-get > /dev/null; then
- echo "ERROR: keystone token-get failed" >&2
- RES=1
-else
- if ! heat stack-list > /dev/null; then
- echo "ERROR: heat stack-list failed" >&2
- RES=1
- fi
-fi
-
-exit $RES
diff --git a/docker/common/heat/heat-api-cfn/config-external.sh b/docker/common/heat/heat-api-cfn/config-external.sh
old mode 100755
new mode 100644
diff --git a/docker/common/heat/heat-api-cfn/config-internal.sh b/docker/common/heat/heat-api-cfn/config-internal.sh
deleted file mode 100755
index 4fce4079c34106ccae4cc41796fe0d4defadd5f9..0000000000000000000000000000000000000000
--- a/docker/common/heat/heat-api-cfn/config-internal.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-set -e
-
-. /opt/kolla/kolla-common.sh
-. /opt/kolla/config-heat.sh
-
-check_required_vars ADMIN_TENANT_NAME \
- HEAT_API_CFN_SERVICE_HOST \
- HEAT_API_CFN_SERVICE_PORT \
- HEAT_CFN_KEYSTONE_PASSWORD \
- HEAT_CFN_KEYSTONE_USER \
- KEYSTONE_ADMIN_SERVICE_HOST \
- KEYSTONE_ADMIN_SERVICE_PORT \
- KEYSTONE_ADMIN_TOKEN \
- KEYSTONE_AUTH_PROTOCOL
-
-fail_unless_os_service_running keystone
-
-export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
-export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0"
-
-crux user-create -n ${HEAT_CFN_KEYSTONE_USER} \
- -p ${HEAT_CFN_KEYSTONE_PASSWORD} \
- -t ${ADMIN_TENANT_NAME} \
- -r admin
-
-crux endpoint-create --remove-all -n ${HEAT_CFN_KEYSTONE_USER} -t cloudformation \
- -I "${KEYSTONE_AUTH_PROTOCOL}://${HEAT_API_CFN_SERVICE_HOST}:${HEAT_API_CFN_SERVICE_PORT}/v1" \
- -P "${KEYSTONE_AUTH_PROTOCOL}://${HEAT_API_CFN_SERVICE_HOST}:${HEAT_API_CFN_SERVICE_PORT}/v1" \
- -A "${KEYSTONE_AUTH_PROTOCOL}://${HEAT_API_CFN_SERVICE_HOST}:${HEAT_API_CFN_SERVICE_PORT}/v1"
-
-exec /usr/bin/heat-api-cfn
diff --git a/docker/common/heat/heat-api-cfn/start.sh b/docker/common/heat/heat-api-cfn/start.sh
index 716527c80e0aac8497a91e122dc9675d3159eb9a..54b53318500fa6c71cf379c67ae371c5d6f8c52f 100755
--- a/docker/common/heat/heat-api-cfn/start.sh
+++ b/docker/common/heat/heat-api-cfn/start.sh
@@ -7,7 +7,7 @@ ARGS=""
# 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
exec $CMD $ARGS
diff --git a/docker/common/heat/heat-api/check.sh b/docker/common/heat/heat-api/check.sh
deleted file mode 100755
index ee03dc6d23e3488433ffda423f567aabda4f9e73..0000000000000000000000000000000000000000
--- a/docker/common/heat/heat-api/check.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-RES=0
-
-. /openrc
-if ! keystone token-get > /dev/null; then
- echo "ERROR: keystone token-get failed" >&2
- RES=1
-else
- if ! heat stack-list > /dev/null; then
- echo "ERROR: heat stack-list failed" >&2
- RES=1
- fi
-fi
-
-exit $RES
diff --git a/docker/common/heat/heat-api/config-external.sh b/docker/common/heat/heat-api/config-external.sh
old mode 100755
new mode 100644
diff --git a/docker/common/heat/heat-api/config-internal.sh b/docker/common/heat/heat-api/config-internal.sh
deleted file mode 100755
index 39acca51538fc3bcbe785929b04df9d66e603813..0000000000000000000000000000000000000000
--- a/docker/common/heat/heat-api/config-internal.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-set -e
-
-. /opt/kolla/kolla-common.sh
-. /opt/kolla/config-heat.sh
-
-check_required_vars ADMIN_TENANT_NAME \
- HEAT_API_SERVICE_HOST \
- HEAT_KEYSTONE_PASSWORD \
- HEAT_KEYSTONE_USER \
- KEYSTONE_ADMIN_SERVICE_HOST \
- KEYSTONE_ADMIN_TOKEN \
- KEYSTONE_AUTH_PROTOCOL \
- PUBLIC_IP
-
-fail_unless_os_service_running keystone
-
-export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
-export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0"
-crux user-create -n ${HEAT_KEYSTONE_USER} \
- -p ${HEAT_KEYSTONE_PASSWORD} \
- -t ${ADMIN_TENANT_NAME} \
- -r admin
-
-crux endpoint-create --remove-all -n ${HEAT_KEYSTONE_USER} -t orchestration \
- -I "${KEYSTONE_AUTH_PROTOCOL}://${HEAT_API_SERVICE_HOST}:8004/v1/%(tenant_id)s" \
- -P "${KEYSTONE_AUTH_PROTOCOL}://${PUBLIC_IP}:8004/v1/%(tenant_id)s" \
- -A "${KEYSTONE_AUTH_PROTOCOL}://${HEAT_API_SERVICE_HOST}:8004/v1/%(tenant_id)s"
-
-# will use crux after https://github.com/larsks/crux/issues/1 is implemented
-openstack role list --os-token="${KEYSTONE_ADMIN_TOKEN}" --os-url $SERVICE_ENDPOINT -f csv | tail -n +2 | awk -F, '{print $2}' | grep heat_stack_user || keystone role-create --name heat_stack_user
-
-exec /usr/bin/heat-api
diff --git a/docker/common/heat/heat-api/start.sh b/docker/common/heat/heat-api/start.sh
index 6dd14d17e5c7d7141e2010ac021e572f92f4d039..a7b14b1d9afd34f371a5ed6cf4727c134e2795f7 100755
--- a/docker/common/heat/heat-api/start.sh
+++ b/docker/common/heat/heat-api/start.sh
@@ -7,7 +7,7 @@ ARGS=""
# 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
exec $CMD $ARGS
diff --git a/docker/common/heat/heat-base/config-heat.sh b/docker/common/heat/heat-base/config-heat.sh
deleted file mode 100755
index 9b71654aa5634e23c526863af3deaeb8ac5f2cfd..0000000000000000000000000000000000000000
--- a/docker/common/heat/heat-base/config-heat.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. /opt/kolla/kolla-common.sh
-
-check_required_vars HEAT_API_CFN_SERVICE_PORT \
- HEAT_API_CFN_URL_HOST \
- HEAT_DB_PASSWORD \
- HEAT_DOMAIN_PASS \
- HEAT_KEYSTONE_PASSWORD \
- KEYSTONE_PUBLIC_SERVICE_HOST \
- KEYSTONE_PUBLIC_SERVICE_PORT \
- MARIADB_SERVICE_HOST \
- RABBITMQ_SERVICE_HOST
-
-fail_unless_db
-dump_vars
-
-# this should use the keystone admin port
-# https://bugs.launchpad.net/kolla/+bug/1469209
-cat > /openrc <<EOF
-export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:\
-${KEYSTONE_PUBLIC_SERVICE_PORT}/v2.0"
-export OS_USERNAME="${HEAT_KEYSTONE_USER}"
-export OS_PASSWORD="${HEAT_KEYSTONE_PASSWORD}"
-export OS_TENANT_NAME="${ADMIN_TENANT_NAME}"
-EOF
-
-crudini --set /etc/heat/heat.conf DEFAULT log_file \
- ""
-crudini --set /etc/heat/heat.conf DEFAULT use_stderr \
- true
-crudini --set /etc/heat/heat.conf DEFAULT rpc_backend \
- heat.openstack.common.rpc.impl_kombu
-crudini --set /etc/heat/heat.conf DEFAULT rabbit_host \
- "${RABBITMQ_SERVICE_HOST}"
-crudini --set /etc/heat/heat.conf DEFAULT rabbit_userid \
- "${RABBIT_USER}"
-crudini --set /etc/heat/heat.conf DEFAULT rabbit_password \
- "${RABBIT_PASSWORD}"
-
-crudini --set /etc/heat/heat.conf database connection \
- mysql://${HEAT_DB_USER}:${HEAT_DB_PASSWORD}@${MARIADB_SERVICE_HOST}/${HEAT_DB_NAME}
-
-crudini --set /etc/heat/heat.conf keystone_authtoken auth_protocol \
- "${KEYSTONE_AUTH_PROTOCOL}"
-crudini --set /etc/heat/heat.conf keystone_authtoken auth_host \
- "${KEYSTONE_PUBLIC_SERVICE_HOST}"
-crudini --set /etc/heat/heat.conf keystone_authtoken auth_port \
- "${KEYSTONE_PUBLIC_SERVICE_PORT}"
-crudini --set /etc/heat/heat.conf keystone_authtoken auth_uri \
- "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_SERVICE_HOST}:${KEYSTONE_PUBLIC_SERVICE_PORT}/v2.0"
-crudini --set /etc/heat/heat.conf keystone_authtoken admin_tenant_name \
- "${ADMIN_TENANT_NAME}"
-crudini --set /etc/heat/heat.conf keystone_authtoken admin_user \
- "${HEAT_KEYSTONE_USER}"
-crudini --set /etc/heat/heat.conf keystone_authtoken admin_password \
- "${HEAT_KEYSTONE_PASSWORD}"
-
-crudini --set /etc/heat/heat.conf ec2authtoken auth_uri \
- "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_SERVICE_HOST}:${KEYSTONE_PUBLIC_SERVICE_PORT}/v2.0"
-
-crudini --set /etc/heat/heat.conf DEFAULT heat_metadata_server_url \
- http://${HEAT_API_CFN_URL_HOST}:${HEAT_API_CFN_SERVICE_PORT}
-crudini --set /etc/heat/heat.conf DEFAULT heat_waitcondition_server_url \
- http://${HEAT_API_CFN_URL_HOST}:${HEAT_API_CFN_SERVICE_PORT}/v1/waitcondition
-
-crudini --set /etc/heat/heat.conf DEFAULT stack_domain_admin \
- "heat_domain_admin"
-crudini --set /etc/heat/heat.conf DEFAULT stack_domain_admin_password \
- "${HEAT_DOMAIN_PASS}"
-crudini --set /etc/heat/heat.conf DEFAULT stack_user_domain_name \
- "heat_user_domain"
diff --git a/docker/common/heat/heat-engine/config-external.sh b/docker/common/heat/heat-engine/config-external.sh
old mode 100755
new mode 100644
diff --git a/docker/common/heat/heat-engine/config-internal.sh b/docker/common/heat/heat-engine/config-internal.sh
deleted file mode 100755
index 90fdfb8d0b2d30b05f215d5b13826cf2fa8f1e32..0000000000000000000000000000000000000000
--- a/docker/common/heat/heat-engine/config-internal.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-. /opt/kolla/kolla-common.sh
-. /opt/kolla/config-heat.sh
-. /openrc
-
-check_required_vars HEAT_DB_NAME \
- HEAT_DB_PASSWORD \
- HEAT_DB_USER \
- HEAT_DOMAIN_PASS \
- INIT_HEAT_DB
-fail_unless_db
-
-if [ "${INIT_HEAT_DB}" == "true" ]; then
- mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
-CREATE DATABASE IF NOT EXISTS ${HEAT_DB_NAME} DEFAULT CHARACTER SET utf8;
-GRANT ALL PRIVILEGES ON ${HEAT_DB_NAME}.* TO
- '${HEAT_DB_USER}'@'%' IDENTIFIED BY '${HEAT_DB_PASSWORD}'
-EOF
-
- /usr/bin/heat-manage db_sync
-
- # If the database needs to be created, assume keystone-setup is allowed to
- # run as well.
- heat-keystone-setup-domain \
- --stack-user-domain-name heat_user_domain \
- --stack-domain-admin heat_domain_admin \
- --stack-domain-admin-password ${HEAT_DOMAIN_PASS}
-fi
-
-exec /usr/bin/heat-engine
diff --git a/docker/common/heat/heat-engine/start.sh b/docker/common/heat/heat-engine/start.sh
index 155a0f46cb99d59b72d93fce4c4cd943fa118bcf..8f9a6f1cb4e6bdbfdacb078309fdf5ab5919866e 100755
--- a/docker/common/heat/heat-engine/start.sh
+++ b/docker/common/heat/heat-engine/start.sh
@@ -7,7 +7,7 @@ ARGS=""
# 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
diff --git a/docs/minimal-environment-vars.md b/docs/minimal-environment-vars.md
index f33e5a3c48a9edf40767442b66177fd58c36dc92..74469f009341ad72709402f304f9e1fd7510f477 100644
--- a/docs/minimal-environment-vars.md
+++ b/docs/minimal-environment-vars.md
@@ -267,46 +267,19 @@ In order for each service to function, there is a minimum set of required variab
# Heat-api-cfn
- ADMIN_TENANT_NAME
- HEAT_API_CFN_SERVICE_HOST
- HEAT_API_CFN_SERVICE_PORT
- HEAT_CFN_KEYSTONE_PASSWORD
- HEAT_CFN_KEYSTONE_USER
- KEYSTONE_ADMIN_SERVICE_HOST
- KEYSTONE_ADMIN_SERVICE_PORT
- KEYSTONE_ADMIN_TOKEN
- KEYSTONE_AUTH_PROTOCOL
+ None
# Heat-api
- ADMIN_TENANT_NAME
- HEAT_API_SERVICE_HOST
- HEAT_KEYSTONE_PASSWORD
- HEAT_KEYSTONE_USER
- KEYSTONE_ADMIN_SERVICE_HOST
- KEYSTONE_ADMIN_TOKEN
- KEYSTONE_AUTH_PROTOCOL
- PUBLIC_IP
+ None
# Heat-base
- HEAT_API_CFN_SERVICE_PORT
- HEAT_API_CFN_URL_HOST
- HEAT_DB_PASSWORD
- HEAT_DOMAIN_PASS
- HEAT_KEYSTONE_PASSWORD
- KEYSTONE_PUBLIC_SERVICE_HOST
- KEYSTONE_PUBLIC_SERVICE_PORT
- MARIADB_SERVICE_HOST
- RABBITMQ_SERVICE_HOST
+ None
# Heat-engine
- HEAT_DB_NAME
- HEAT_DB_PASSWORD
- HEAT_DB_USER
- HEAT_DOMAIN_PASS
- INIT_HEAT_DB
+ None
# Horizon