From a71a61a471001e6bc546c9204015b2d60cf0de84 Mon Sep 17 00:00:00 2001 From: caowei Date: Mon, 30 Oct 2017 10:14:40 +0800 Subject: [PATCH] Add ceph-common package to manila-share container Change-Id: I6248152d9a272a1cfa3ebc549428b67ead111f45 Implements: blueprint manila-cephfs-backend --- docker/manila/manila-share/Dockerfile.j2 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2 index d141177eb4..1e4871297d 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 %}