From a6ccbe1803c885ccbddfda1499f5ebb3102f2d8e Mon Sep 17 00:00:00 2001
From: Mauricio Lima <mauriciolimab@gmail.com>
Date: Thu, 3 Nov 2016 13:02:18 -0300
Subject: [PATCH] Fix Manila-data binary distro
Closes-Bug: #1639011
Change-Id: Icc4e798590645910de1a86eaf46082343d999f6a
---
docker/manila/manila-data/Dockerfile.j2 | 7 ++++++-
tests/test_build.py | 2 ++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2
index 8878d1acbe..b1777bfae9 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")) }}
diff --git a/tests/test_build.py b/tests/test_build.py
index 1a89821e06..db2cf3713d 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -70,6 +70,7 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
"searchlight-base",
"senlin-base",
"vmtp",
+ "manila-data",
"watcher-base",
"congress-base",
"bifrost-base",
@@ -123,6 +124,7 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
"searchlight-base",
"senlin-base",
"vmtp",
+ "manila-data",
"watcher-base",
"congress-base",
"bifrost-base",
--
GitLab