diff options
| author | Zuul <zuul@review.openstack.org> | 2017-11-14 08:23:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-11-14 08:23:41 +0000 |
| commit | d1c15631bafae623ad8f2534541e9cc9b2179729 (patch) | |
| tree | 2ae66ae0e8d5f68465d29ca404cdec11b1871c09 /docker | |
| parent | 35fd42d9ce52f2b3adea1598a0b86ad3094e25d8 (diff) | |
| parent | a71a61a471001e6bc546c9204015b2d60cf0de84 (diff) | |
| download | kolla-d1c15631bafae623ad8f2534541e9cc9b2179729.tar.gz kolla-d1c15631bafae623ad8f2534541e9cc9b2179729.zip | |
Merge "Add ceph-common package to manila-share container"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/manila/manila-share/Dockerfile.j2 | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2 index d141177eb..1e4871297 100644 --- a/docker/manila/manila-share/Dockerfile.j2 +++ b/docker/manila/manila-share/Dockerfile.j2 @@ -12,10 +12,30 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openstack-manila-share', 'ceph-common' ] %} + {% elif base_distro in ['debian', 'ubuntu'] %} + {% set manila_share_packages = [ + 'manila-share', + 'ceph-common' + ] %} + + {% endif %} {{ macros.install_packages(manila_share_packages | customizable("packages")) }} +{% elif install_type == 'source' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set manila_share_packages = [ + 'ceph-common' + ] %} + {% elif base_distro in ['debian', 'ubuntu'] %} + {% set manila_share_packages = [ + 'ceph-common' + ] %} + {% endif %} + +{{ macros.install_packages(manila_share_packages | customizable("packages")) }} + {% endif %} {% block manila_share_footer %}{% endblock %} |