aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorcaowei <cao.wei@99cloud.net>2017-10-30 10:14:40 +0800
committercaowei <cao.wei@99cloud.net>2017-10-30 10:25:15 +0800
commita71a61a471001e6bc546c9204015b2d60cf0de84 (patch)
tree85d2f0902271f8d3ab1ee2e3294491878bba24f4 /docker
parent48df9f27b04fcb34c4ba3609a6814843183a74cb (diff)
downloadkolla-a71a61a471001e6bc546c9204015b2d60cf0de84.tar.gz
kolla-a71a61a471001e6bc546c9204015b2d60cf0de84.zip
Add ceph-common package to manila-share container
Change-Id: I6248152d9a272a1cfa3ebc549428b67ead111f45 Implements: blueprint manila-cephfs-backend
Diffstat (limited to 'docker')
-rw-r--r--docker/manila/manila-share/Dockerfile.j220
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 %}