openstack/kolla
Code Issues Proposed changes

Add the missing murano package files

Browse Source 
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
This commit is contained in:
chenxing 2017-11-23 18:28:08 +08:00 committed by Chason Chan
parent 27ab91b2ab
commit 2faaf37e86
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/murano/murano-api/Dockerfile.j2
View File

@ -7,10 +7,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% 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'] %} {% set murano_api_packages = ['openstack-murano-api'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% 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'] %} {% set murano_api_packages = ['murano-api'] %}
{% endif %} {% endif %}