diff options
| -rw-r--r-- | docker/common/murano/murano-api/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/murano/murano-api/start.sh | 20 | ||||
| -rw-r--r-- | docker/common/murano/murano-engine/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/murano/murano-engine/start.sh | 13 | ||||
| -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 |
8 files changed, 53 insertions, 57 deletions
diff --git a/docker/common/murano/murano-api/config-external.sh b/docker/common/murano/murano-api/config-external.sh deleted file mode 100644 index 5d9a2da49..000000000 --- a/docker/common/murano/murano-api/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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/common/murano/murano-api/start.sh b/docker/common/murano/murano-api/start.sh deleted file mode 100755 index 7d712177d..000000000 --- a/docker/common/murano/murano-api/start.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/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/common/murano/murano-engine/config-external.sh b/docker/common/murano/murano-engine/config-external.sh deleted file mode 100644 index 5d9a2da49..000000000 --- a/docker/common/murano/murano-engine/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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/common/murano/murano-engine/start.sh b/docker/common/murano/murano-engine/start.sh deleted file mode 100755 index 22834fc4c..000000000 --- a/docker/common/murano/murano-engine/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/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 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 |