From a6454f15f21064e6eb10a22d4b3fba957eace39f Mon Sep 17 00:00:00 2001 From: Paul Bourke Date: Wed, 5 Aug 2015 15:19:38 +0000 Subject: 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 Implements: blueprint enable-murano-container Change-Id: Ia46985b21bb5f6d7690501e7199800c8c7fcb51f --- docker/centos/source/murano/murano-api/Dockerfile | 8 ++++++++ docker/centos/source/murano/murano-api/build | 1 + docker/centos/source/murano/murano-api/config-external.sh | 1 + docker/centos/source/murano/murano-api/start.sh | 1 + docker/centos/source/murano/murano-base/.buildinfo | 10 ++++++++++ docker/centos/source/murano/murano-base/Dockerfile | 15 +++++++++++++++ docker/centos/source/murano/murano-base/build | 1 + docker/centos/source/murano/murano-engine/Dockerfile | 8 ++++++++ docker/centos/source/murano/murano-engine/build | 1 + .../centos/source/murano/murano-engine/config-external.sh | 1 + docker/centos/source/murano/murano-engine/start.sh | 1 + 11 files changed, 48 insertions(+) create mode 100644 docker/centos/source/murano/murano-api/Dockerfile create mode 120000 docker/centos/source/murano/murano-api/build create mode 120000 docker/centos/source/murano/murano-api/config-external.sh create mode 120000 docker/centos/source/murano/murano-api/start.sh create mode 100644 docker/centos/source/murano/murano-base/.buildinfo create mode 100644 docker/centos/source/murano/murano-base/Dockerfile create mode 120000 docker/centos/source/murano/murano-base/build create mode 100644 docker/centos/source/murano/murano-engine/Dockerfile create mode 120000 docker/centos/source/murano/murano-engine/build create mode 120000 docker/centos/source/murano/murano-engine/config-external.sh create mode 120000 docker/centos/source/murano/murano-engine/start.sh (limited to 'docker/centos/source') 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 -- cgit v1.2.3