From 2faaf37e86b9fe1d767ce514759633a1ec2ba52c Mon Sep 17 00:00:00 2001 From: chenxing Date: Thu, 23 Nov 2017 18:28:08 +0800 Subject: [PATCH] Add the missing murano package files When enable Murano, kolla-ansible will import the io.murano.applications.zip file[1]. But Murano container doesn't symlink this file. This patch is to add the missing link. [1] https://github.com/openstack/kolla-ansible/blob/master/ansible/roles/murano/tasks/start.yml#L69 Change-Id: Id791fc39e1f5136add7d10db291cbdba59d1c291 Closes-Bug: #1734019 --- docker/murano/murano-api/Dockerfile.j2 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 index 9c5d71fec9..e3712080fa 100644 --- a/docker/murano/murano-api/Dockerfile.j2 +++ b/docker/murano/murano-api/Dockerfile.j2 @@ -7,10 +7,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} -RUN ln -s /var/cache/murano/meta/io.murano.zip /io.murano.zip +RUN ln -s /var/cache/murano/meta/io.murano.zip /io.murano.zip \ + && ln -s /var/cache/murano/meta/io.murano.applications.zip /io.murano.applications.zip {% set murano_api_packages = ['openstack-murano-api'] %} {% elif base_distro in ['debian', 'ubuntu'] %} -RUN ln -s /usr/share/murano-common/io.murano.zip /io.murano.zip +RUN ln -s /usr/share/murano-common/io.murano.zip /io.murano.zip \ + && ln -s /var/cache/murano/meta/io.murano.applications.zip /io.murano.applications.zip {% set murano_api_packages = ['murano-api'] %} {% endif %}