From 9f5efc5ea6736001160b49a81ec6274ba6353169 Mon Sep 17 00:00:00 2001
From: Paul Bourke <paul.bourke@oracle.com>
Date: Wed, 24 Aug 2016 17:21:04 +0100
Subject: Import the Murano core libary as part of setup

In order for Murano to be operational the core library package must be
imported [0]

Add Ansible tasks to do this idempotently.

[0] http://docs.openstack.org/developer/murano/install/manual.html

TrivialFix

Change-Id: I2c49e9d663595650b885267839012b543505337a
---
 docker/murano/murano-api/Dockerfile.j2  | 2 ++
 docker/murano/murano-base/Dockerfile.j2 | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'docker/murano')

diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2
index 611d3131c..76dc174f4 100644
--- a/docker/murano/murano-api/Dockerfile.j2
+++ b/docker/murano/murano-api/Dockerfile.j2
@@ -4,8 +4,10 @@ MAINTAINER {{ maintainer }}
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+RUN ln -s /var/cache/murano/meta/io.murano.zip /io.murano.zip
        {% set murano_api_packages = ['openstack-murano-api'] %}
     {% elif base_distro in ['ubuntu'] %}
+RUN ln -s /usr/share/murano-common/io.murano.zip /io.murano.zip
         {% set murano_api_packages = ['murano-api'] %}
     {% endif %}
 
diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2
index 5649cc56b..295f327a4 100644
--- a/docker/murano/murano-base/Dockerfile.j2
+++ b/docker/murano/murano-base/Dockerfile.j2
@@ -21,7 +21,9 @@ RUN ln -s murano-base-source/* murano \
     && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /murano \
     && mkdir -p /etc/murano /home/murano \
     && cp -r /murano/etc/murano/* /etc/murano/ \
-    && chown -R murano: /etc/murano /home/murano
+    && chown -R murano: /etc/murano /home/murano \
+    && cd murano/meta/io.murano \
+    && zip -r /io.murano.zip *
 
 {% endif %}
 
-- 
cgit v1.2.3