openstack/kolla
Code Issues Proposed changes

Add ceph-common package to manila-share container

Browse Source 
Change-Id: I6248152d9a272a1cfa3ebc549428b67ead111f45
Implements: blueprint manila-cephfs-backend
This commit is contained in:
caowei 2017-10-30 10:14:40 +08:00
parent 48df9f27b0
commit a71a61a471
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
docker/manila/manila-share/Dockerfile.j2
View File

@ -12,10 +12,30 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openstack-manila-share', 'openstack-manila-share',
'ceph-common' '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")) }} {{ 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 %} {% endif %}
{{ macros.install_packages(manila_share_packages | customizable("packages")) }}
{% endif %} {% endif %}
{% block manila_share_footer %}{% endblock %} {% block manila_share_footer %}{% endblock %}