Merge "Implement Murano source images"

15 files changed, 101 insertions, 0 deletions

diff --git a/docker/centos/source/murano/murano-api/Dockerfile b/docker/centos/source/murano/murano-api/Dockerfile
new file mode 100644
index 000000000..a838fa8ac
--- /dev/null
+++ b/docker/centos/source/murano/murano-api/Dockerfile
@@ -0,0 +1,8 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%murano-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY config-external.sh /opt/kolla/
+
+COPY start.sh /
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/murano/murano-api/build b/docker/centos/source/murano/murano-api/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/murano/murano-api/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/murano/murano-api/config-external.sh b/docker/centos/source/murano/murano-api/config-external.sh
new file mode 120000
index 000000000..6b73e957f
--- /dev/null
+++ b/docker/centos/source/murano/murano-api/config-external.sh
@@ -0,0 +1 @@
+../../../../common/murano/murano-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/murano/murano-api/start.sh b/docker/centos/source/murano/murano-api/start.sh
new file mode 120000
index 000000000..bcf6f43e7
--- /dev/null
+++ b/docker/centos/source/murano/murano-api/start.sh
@@ -0,0 +1 @@
+../../../../common/murano/murano-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/murano/murano-base/.buildinfo b/docker/centos/source/murano/murano-base/.buildinfo
new file mode 100644
index 000000000..4806db155
--- /dev/null
+++ b/docker/centos/source/murano/murano-base/.buildinfo
@@ -0,0 +1,10 @@
+# Build info specific to this image. All values can be overridden in .buildconf
+
+COMPONENT=murano
+SOURCE_INSTALL_AVAILABLE=1
+
+# Used for git install method
+: ${CLONE_FROM:=https://github.com/openstack/murano}
+
+# Used for curl install method
+: ${TARBALL_URI:=http://tarballs.openstack.org/murano/murano-master.tar.gz}
diff --git a/docker/centos/source/murano/murano-base/Dockerfile b/docker/centos/source/murano/murano-base/Dockerfile
new file mode 100644
index 000000000..21de3ece3
--- /dev/null
+++ b/docker/centos/source/murano/murano-base/Dockerfile
@@ -0,0 +1,15 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+ADD ./murano.tar /
+RUN ln -s /murano-* /murano
+
+RUN cd /murano \
+    && pip install -r requirements.txt \
+    && pip install /murano \
+    && mkdir /etc/murano \
+    && cd /murano \
+    && tox -e genconfig \
+    && cp -r etc/murano/* /etc/murano/ \
+    && cp etc/murano/murano.conf.sample /etc/murano/murano.conf \
+    && rm -rf /root/.cache
diff --git a/docker/centos/source/murano/murano-base/build b/docker/centos/source/murano/murano-base/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/murano/murano-base/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/murano/murano-engine/Dockerfile b/docker/centos/source/murano/murano-engine/Dockerfile
new file mode 100644
index 000000000..a838fa8ac
--- /dev/null
+++ b/docker/centos/source/murano/murano-engine/Dockerfile
@@ -0,0 +1,8 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%murano-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY config-external.sh /opt/kolla/
+
+COPY start.sh /
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/murano/murano-engine/build b/docker/centos/source/murano/murano-engine/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/murano/murano-engine/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/murano/murano-engine/config-external.sh b/docker/centos/source/murano/murano-engine/config-external.sh
new file mode 120000
index 000000000..1c8e0612c
--- /dev/null
+++ b/docker/centos/source/murano/murano-engine/config-external.sh
@@ -0,0 +1 @@
+../../../../common/murano/murano-engine/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/murano/murano-engine/start.sh b/docker/centos/source/murano/murano-engine/start.sh
new file mode 120000
index 000000000..a4b0147fb
--- /dev/null
+++ b/docker/centos/source/murano/murano-engine/start.sh
@@ -0,0 +1 @@
+../../../../common/murano/murano-engine/start.sh
\ No newline at end of file
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