diff options
| author | chenxing <chason.chan@foxmail.com> | 2017-11-23 18:28:08 +0800 |
|---|---|---|
| committer | Chason Chan <chason.chan@foxmail.com> | 2017-12-05 08:16:21 +0000 |
| commit | 2faaf37e86b9fe1d767ce514759633a1ec2ba52c (patch) | |
| tree | ba6d0c9ff21bc981fdda7297a31b141c2fcf01fe | |
| parent | 27ab91b2abfc7e5e3906c335fe29698a6ca34527 (diff) | |
| download | kolla-2faaf37e86b9fe1d767ce514759633a1ec2ba52c.tar.gz kolla-2faaf37e86b9fe1d767ce514759633a1ec2ba52c.zip | |
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
| -rw-r--r-- | docker/murano/murano-api/Dockerfile.j2 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 index 9c5d71fec..e3712080f 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 %} |