diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-28 12:16:53 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-28 13:33:50 +0000 |
| commit | cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2 (patch) | |
| tree | 2e4256b6b7b8339da11b1d17250378596e61605b /docker/murano/murano-engine | |
| parent | 3b5380ade021c9884551f427441cbfc0122eb0f0 (diff) | |
| download | kolla-cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2.tar.gz kolla-cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2.zip | |
Move docker_templates to docker dir
Updated build.py to reflect this change.
Deprecate --template option and make it a noop.
Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2
Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker/murano/murano-engine')
| -rw-r--r-- | docker/murano/murano-engine/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/murano/murano-engine/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/murano/murano-engine/start.sh | 13 |
3 files changed, 32 insertions, 0 deletions
diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2 new file mode 100644 index 000000000..f1d7e1f42 --- /dev/null +++ b/docker/murano/murano-engine/Dockerfile.j2 @@ -0,0 +1,9 @@ +FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-murano-base:{{ tag }} +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +COPY config-external.sh /opt/kolla/ +COPY start.sh / + +CMD ["/start.sh"] + +{{ include_footer }} diff --git a/docker/murano/murano-engine/config-external.sh b/docker/murano/murano-engine/config-external.sh new file mode 100644 index 000000000..5d9a2da49 --- /dev/null +++ b/docker/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/murano/murano-engine/start.sh b/docker/murano/murano-engine/start.sh new file mode 100755 index 000000000..22834fc4c --- /dev/null +++ b/docker/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 |