diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2015-08-05 15:19:38 +0000 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2015-08-10 15:52:21 +0000 |
| commit | a6454f15f21064e6eb10a22d4b3fba957eace39f (patch) | |
| tree | 103aa4fd4980ed9af39be2019ef7fc10e633597c /docker/common | |
| parent | fe9092bab7ecfc58aa10ba4165c9bf21a99170e2 (diff) | |
| download | kolla-a6454f15f21064e6eb10a22d4b3fba957eace39f.tar.gz kolla-a6454f15f21064e6eb10a22d4b3fba957eace39f.zip | |
Implement Murano source images
* Both api and engine start up without error, but can't test properly
until Horizon is fixed (bug #1482196)
* These are source installs are there no RPMs available for Murano
that I can find.
* Also requires a plugin for horizon that will be made as a
separate commit
Co-Authored-By: Mick Thompson <michael.a.thompson@oracle.com>
Implements: blueprint enable-murano-container
Change-Id: Ia46985b21bb5f6d7690501e7199800c8c7fcb51f
Diffstat (limited to 'docker/common')
| -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 |
4 files changed, 53 insertions, 0 deletions
diff --git a/docker/common/murano/murano-api/config-external.sh b/docker/common/murano/murano-api/config-external.sh new file mode 100644 index 000000000..5d9a2da49 --- /dev/null +++ b/docker/common/murano/murano-api/config-external.sh @@ -0,0 +1,10 @@ +#!/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 new file mode 100755 index 000000000..7d712177d --- /dev/null +++ b/docker/common/murano/murano-api/start.sh @@ -0,0 +1,20 @@ +#!/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 new file mode 100644 index 000000000..5d9a2da49 --- /dev/null +++ b/docker/common/murano/murano-engine/config-external.sh @@ -0,0 +1,10 @@ +#!/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 new file mode 100755 index 000000000..22834fc4c --- /dev/null +++ b/docker/common/murano/murano-engine/start.sh @@ -0,0 +1,13 @@ +#!/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 |