From 43327444cae3c8390791302d60fac6da31a4c9f5 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Thu, 27 Aug 2015 18:06:42 -0700 Subject: [PATCH] Move scripts for heat to docker_templates Change-Id: I22ff477865382d2612eee97390a9580d2d03f40c Partially-Implements: blueprint remove-docker-dir --- .../heat/heat-api-cfn/config-external.sh | 10 --------- docker/common/heat/heat-api-cfn/start.sh | 13 ------------ .../common/heat/heat-api/config-external.sh | 10 --------- docker/common/heat/heat-api/start.sh | 13 ------------ .../heat/heat-engine/config-external.sh | 10 --------- docker/common/heat/heat-engine/start.sh | 20 ------------------ .../heat/heat-api-cfn/config-external.sh | 11 +++++++++- docker_templates/heat/heat-api-cfn/start.sh | 14 ++++++++++++- .../heat/heat-api/config-external.sh | 11 +++++++++- docker_templates/heat/heat-api/start.sh | 14 ++++++++++++- .../heat/heat-engine/config-external.sh | 11 +++++++++- docker_templates/heat/heat-engine/start.sh | 21 ++++++++++++++++++- 12 files changed, 76 insertions(+), 82 deletions(-) delete mode 100644 docker/common/heat/heat-api-cfn/config-external.sh delete mode 100755 docker/common/heat/heat-api-cfn/start.sh delete mode 100644 docker/common/heat/heat-api/config-external.sh delete mode 100755 docker/common/heat/heat-api/start.sh delete mode 100644 docker/common/heat/heat-engine/config-external.sh delete mode 100755 docker/common/heat/heat-engine/start.sh mode change 120000 => 100644 docker_templates/heat/heat-api-cfn/config-external.sh mode change 120000 => 100755 docker_templates/heat/heat-api-cfn/start.sh mode change 120000 => 100644 docker_templates/heat/heat-api/config-external.sh mode change 120000 => 100755 docker_templates/heat/heat-api/start.sh mode change 120000 => 100644 docker_templates/heat/heat-engine/config-external.sh mode change 120000 => 100755 docker_templates/heat/heat-engine/start.sh 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 91d5742f19..0000000000 --- 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 54b5331850..0000000000 --- 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 ca5d73e909..0000000000 --- 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 a7b14b1d9a..0000000000 --- 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 bde0ffe0de..0000000000 --- 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 8f9a6f1cb4..0000000000 --- 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 diff --git a/docker_templates/heat/heat-api-cfn/config-external.sh b/docker_templates/heat/heat-api-cfn/config-external.sh deleted file mode 120000 index 3554b955f6..0000000000 --- a/docker_templates/heat/heat-api-cfn/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/heat/heat-api-cfn/config-external.sh \ No newline at end of file diff --git a/docker_templates/heat/heat-api-cfn/config-external.sh b/docker_templates/heat/heat-api-cfn/config-external.sh new file mode 100644 index 0000000000..91d5742f19 --- /dev/null +++ b/docker_templates/heat/heat-api-cfn/config-external.sh @@ -0,0 +1,10 @@ +#!/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 deleted file mode 120000 index a432274f72..0000000000 --- a/docker_templates/heat/heat-api-cfn/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/heat/heat-api-cfn/start.sh \ No newline at end of file diff --git a/docker_templates/heat/heat-api-cfn/start.sh b/docker_templates/heat/heat-api-cfn/start.sh new file mode 100755 index 0000000000..54b5331850 --- /dev/null +++ b/docker_templates/heat/heat-api-cfn/start.sh @@ -0,0 +1,13 @@ +#!/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 deleted file mode 120000 index 72176b1a0c..0000000000 --- a/docker_templates/heat/heat-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/heat/heat-api/config-external.sh \ No newline at end of file diff --git a/docker_templates/heat/heat-api/config-external.sh b/docker_templates/heat/heat-api/config-external.sh new file mode 100644 index 0000000000..ca5d73e909 --- /dev/null +++ b/docker_templates/heat/heat-api/config-external.sh @@ -0,0 +1,10 @@ +#!/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 deleted file mode 120000 index c0584ab542..0000000000 --- a/docker_templates/heat/heat-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/heat/heat-api/start.sh \ No newline at end of file diff --git a/docker_templates/heat/heat-api/start.sh b/docker_templates/heat/heat-api/start.sh new file mode 100755 index 0000000000..a7b14b1d9a --- /dev/null +++ b/docker_templates/heat/heat-api/start.sh @@ -0,0 +1,13 @@ +#!/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 deleted file mode 120000 index 1e03e6c3b4..0000000000 --- a/docker_templates/heat/heat-engine/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/heat/heat-engine/config-external.sh \ No newline at end of file diff --git a/docker_templates/heat/heat-engine/config-external.sh b/docker_templates/heat/heat-engine/config-external.sh new file mode 100644 index 0000000000..bde0ffe0de --- /dev/null +++ b/docker_templates/heat/heat-engine/config-external.sh @@ -0,0 +1,10 @@ +#!/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 deleted file mode 120000 index 5de8025b53..0000000000 --- a/docker_templates/heat/heat-engine/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/heat/heat-engine/start.sh \ No newline at end of file diff --git a/docker_templates/heat/heat-engine/start.sh b/docker_templates/heat/heat-engine/start.sh new file mode 100755 index 0000000000..8f9a6f1cb4 --- /dev/null +++ b/docker_templates/heat/heat-engine/start.sh @@ -0,0 +1,20 @@ +#!/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