aboutsummaryrefslogtreecommitdiff
path: root/docker_templates
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-27 18:06:42 -0700
committerSteven Dake <stdake@cisco.com>2015-08-28 00:50:29 -0700
commit43327444cae3c8390791302d60fac6da31a4c9f5 (patch)
treebe8efc0556ce6b39a8a42daba0def143dacd188a /docker_templates
parent739c2c6e3aa0518308cb39be989879f3eaa4b227 (diff)
downloadkolla-43327444cae3c8390791302d60fac6da31a4c9f5.tar.gz
kolla-43327444cae3c8390791302d60fac6da31a4c9f5.zip
Move scripts for heat to docker_templates
Change-Id: I22ff477865382d2612eee97390a9580d2d03f40c Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker_templates')
-rw-r--r--[l---------]docker_templates/heat/heat-api-cfn/config-external.sh11
-rwxr-xr-x[l---------]docker_templates/heat/heat-api-cfn/start.sh14
-rw-r--r--[l---------]docker_templates/heat/heat-api/config-external.sh11
-rwxr-xr-x[l---------]docker_templates/heat/heat-api/start.sh14
-rw-r--r--[l---------]docker_templates/heat/heat-engine/config-external.sh11
-rwxr-xr-x[l---------]docker_templates/heat/heat-engine/start.sh21
6 files changed, 76 insertions, 6 deletions
diff --git a/docker_templates/heat/heat-api-cfn/config-external.sh b/docker_templates/heat/heat-api-cfn/config-external.sh
index 3554b955f..91d5742f1 120000..100644
--- a/docker_templates/heat/heat-api-cfn/config-external.sh
+++ b/docker_templates/heat/heat-api-cfn/config-external.sh
@@ -1 +1,10 @@
-../../../docker/common/heat/heat-api-cfn/config-external.sh \ No newline at end of file
+#!/bin/bash
+SOURCE="/opt/kolla/heat-api-cfn/heat.conf"
+TARGET="/etc/heat/heat.conf"
+OWNER="heat"
+
+if [[ -f "$SOURCE" ]]; then
+ cp $SOURCE $TARGET
+ chown ${OWNER}: $TARGET
+ chmod 0644 $TARGET
+fi
diff --git a/docker_templates/heat/heat-api-cfn/start.sh b/docker_templates/heat/heat-api-cfn/start.sh
index a432274f7..54b533185 120000..100755
--- a/docker_templates/heat/heat-api-cfn/start.sh
+++ b/docker_templates/heat/heat-api-cfn/start.sh
@@ -1 +1,13 @@
-../../../docker/common/heat/heat-api-cfn/start.sh \ No newline at end of file
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/heat-api-cfn"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker_templates/heat/heat-api/config-external.sh b/docker_templates/heat/heat-api/config-external.sh
index 72176b1a0..ca5d73e90 120000..100644
--- a/docker_templates/heat/heat-api/config-external.sh
+++ b/docker_templates/heat/heat-api/config-external.sh
@@ -1 +1,10 @@
-../../../docker/common/heat/heat-api/config-external.sh \ No newline at end of file
+#!/bin/bash
+SOURCE="/opt/kolla/heat-api/heat-api.conf"
+TARGET="/etc/heat/heat-api.conf"
+OWNER="heat"
+
+if [[ -f "$SOURCE" ]]; then
+ cp $SOURCE $TARGET
+ chown ${OWNER}: $TARGET
+ chmod 0644 $TARGET
+fi
diff --git a/docker_templates/heat/heat-api/start.sh b/docker_templates/heat/heat-api/start.sh
index c0584ab54..a7b14b1d9 120000..100755
--- a/docker_templates/heat/heat-api/start.sh
+++ b/docker_templates/heat/heat-api/start.sh
@@ -1 +1,13 @@
-../../../docker/common/heat/heat-api/start.sh \ No newline at end of file
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/heat-api"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker_templates/heat/heat-engine/config-external.sh b/docker_templates/heat/heat-engine/config-external.sh
index 1e03e6c3b..bde0ffe0d 120000..100644
--- a/docker_templates/heat/heat-engine/config-external.sh
+++ b/docker_templates/heat/heat-engine/config-external.sh
@@ -1 +1,10 @@
-../../../docker/common/heat/heat-engine/config-external.sh \ No newline at end of file
+#!/bin/bash
+SOURCE="/opt/kolla/heat-engine/heat.conf"
+TARGET="/etc/heat/heat.conf"
+OWNER="heat"
+
+if [[ -f "$SOURCE" ]]; then
+ cp $SOURCE $TARGET
+ chown ${OWNER}: $TARGET
+ chmod 0644 $TARGET
+fi
diff --git a/docker_templates/heat/heat-engine/start.sh b/docker_templates/heat/heat-engine/start.sh
index 5de8025b5..8f9a6f1cb 120000..100755
--- a/docker_templates/heat/heat-engine/start.sh
+++ b/docker_templates/heat/heat-engine/start.sh
@@ -1 +1,20 @@
-../../../docker/common/heat/heat-engine/start.sh \ No newline at end of file
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/heat-engine"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
+# of the KOLLA_BOOTSTRAP variable being set, including empty.
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
+ su -s /bin/bash -c "/usr/bin/heat-manage db_sync" heat
+ exit 0
+fi
+
+exec $CMD $ARGS