aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMauricio Lima <mauriciolimab@gmail.com>2016-11-03 13:02:18 -0300
committerJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-11-04 04:51:16 +0000
commita6ccbe1803c885ccbddfda1499f5ebb3102f2d8e (patch)
tree070803fed1e78bcd25482ed8b5aacc89403decd9 /docker
parent7de2e5202b9607fe1b5debb18a864920140bdbdf (diff)
downloadkolla-a6ccbe1803c885ccbddfda1499f5ebb3102f2d8e.tar.gz
kolla-a6ccbe1803c885ccbddfda1499f5ebb3102f2d8e.zip
Fix Manila-data binary distro
Closes-Bug: #1639011 Change-Id: Icc4e798590645910de1a86eaf46082343d999f6a
Diffstat (limited to 'docker')
-rw-r--r--docker/manila/manila-data/Dockerfile.j27
1 files changed, 6 insertions, 1 deletions
diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2
index 8878d1acb..b1777bfae 100644
--- a/docker/manila/manila-data/Dockerfile.j2
+++ b/docker/manila/manila-data/Dockerfile.j2
@@ -8,8 +8,13 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+ && /bin/false
+
+ {% elif base_distro in ['ubuntu'] %}
+
{% set manila_data_packages = [
- 'manila-data'
+ 'manila-data'
] %}
{{ macros.install_packages(manila_data_packages | customizable("packages")) }}