aboutsummaryrefslogtreecommitdiff
path: root/docker
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
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')
-rw-r--r--docker/common/heat/heat-api-cfn/config-external.sh10
-rwxr-xr-xdocker/common/heat/heat-api-cfn/start.sh13
-rw-r--r--docker/common/heat/heat-api/config-external.sh10
-rwxr-xr-xdocker/common/heat/heat-api/start.sh13
-rw-r--r--docker/common/heat/heat-engine/config-external.sh10
-rwxr-xr-xdocker/common/heat/heat-engine/start.sh20
6 files changed, 0 insertions, 76 deletions
diff --git a/docker/common/heat/heat-api-cfn/config-external.sh b/docker/common/heat/heat-api-cfn/config-external.sh
deleted file mode 100644
index 91d5742f1..000000000
--- a/docker/common/heat/heat-api-cfn/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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/common/heat/heat-api-cfn/start.sh b/docker/common/heat/heat-api-cfn/start.sh
deleted file mode 100755
index 54b533185..000000000
--- a/docker/common/heat/heat-api-cfn/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/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/common/heat/heat-api/config-external.sh b/docker/common/heat/heat-api/config-external.sh
deleted file mode 100644
index ca5d73e90..000000000
--- a/docker/common/heat/heat-api/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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/common/heat/heat-api/start.sh b/docker/common/heat/heat-api/start.sh
deleted file mode 100755
index a7b14b1d9..000000000
--- a/docker/common/heat/heat-api/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/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/common/heat/heat-engine/config-external.sh b/docker/common/heat/heat-engine/config-external.sh
deleted file mode 100644
index bde0ffe0d..000000000
--- a/docker/common/heat/heat-engine/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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/common/heat/heat-engine/start.sh b/docker/common/heat/heat-engine/start.sh
deleted file mode 100755
index 8f9a6f1cb..000000000
--- a/docker/common/heat/heat-engine/start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/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