diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-27 18:27:37 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-28 00:50:29 -0700 |
| commit | 6434f19ef279f2575e9f0649e9940f88880da424 (patch) | |
| tree | af00b540970c9b983b6873e21d8e2b7d0103cfe8 /docker_templates/murano | |
| parent | eb9d7da1a085e1179e0e922eebcd25c776d8196a (diff) | |
| download | kolla-6434f19ef279f2575e9f0649e9940f88880da424.tar.gz kolla-6434f19ef279f2575e9f0649e9940f88880da424.zip | |
Move scripts for murano to docker_templates
Change-Id: I1f7090d22c33891717002297c898cf1b5ddb210c
Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker_templates/murano')
| -rw-r--r--[l---------] | docker_templates/murano/murano-api/config-external.sh | 11 | ||||
| -rwxr-xr-x[l---------] | docker_templates/murano/murano-api/start.sh | 21 | ||||
| -rw-r--r--[l---------] | docker_templates/murano/murano-engine/config-external.sh | 11 | ||||
| -rwxr-xr-x[l---------] | docker_templates/murano/murano-engine/start.sh | 14 |
4 files changed, 53 insertions, 4 deletions
diff --git a/docker_templates/murano/murano-api/config-external.sh b/docker_templates/murano/murano-api/config-external.sh index 508c2d564..5d9a2da49 120000..100644 --- a/docker_templates/murano/murano-api/config-external.sh +++ b/docker_templates/murano/murano-api/config-external.sh @@ -1 +1,10 @@ -../../../docker/common/murano/murano-api/config-external.sh
\ No newline at end of file +#!/bin/bash +SOURCE="/opt/kolla/murano/murano.conf" +TARGET="/etc/murano/murano.conf" +OWNER="murano" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker_templates/murano/murano-api/start.sh b/docker_templates/murano/murano-api/start.sh index 00416066a..7d712177d 120000..100755 --- a/docker_templates/murano/murano-api/start.sh +++ b/docker_templates/murano/murano-api/start.sh @@ -1 +1,20 @@ -../../../docker/common/murano/murano-api/start.sh
\ No newline at end of file +#!/bin/bash +set -o errexit + +CMD="/usr/bin/murano-api" +ARGS="--config-file /etc/murano/murano.conf" + +# 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/sh -c "murano-db-manage --config-file /etc/murano/murano.conf upgrade" murano + exit 0 +fi + +exec $CMD $ARGS diff --git a/docker_templates/murano/murano-engine/config-external.sh b/docker_templates/murano/murano-engine/config-external.sh index 7b42bd825..5d9a2da49 120000..100644 --- a/docker_templates/murano/murano-engine/config-external.sh +++ b/docker_templates/murano/murano-engine/config-external.sh @@ -1 +1,10 @@ -../../../docker/common/murano/murano-engine/config-external.sh
\ No newline at end of file +#!/bin/bash +SOURCE="/opt/kolla/murano/murano.conf" +TARGET="/etc/murano/murano.conf" +OWNER="murano" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker_templates/murano/murano-engine/start.sh b/docker_templates/murano/murano-engine/start.sh index 160b19626..22834fc4c 120000..100755 --- a/docker_templates/murano/murano-engine/start.sh +++ b/docker_templates/murano/murano-engine/start.sh @@ -1 +1,13 @@ -../../../docker/common/murano/murano-engine/start.sh
\ No newline at end of file +#!/bin/bash +set -o errexit + +CMD="/usr/bin/murano-engine" +ARGS="--config-file /etc/murano/murano.conf" + +# Loading common functions. +source /opt/kolla/kolla-common.sh + +# Execute config strategy +set_configs + +exec $CMD $ARGS |