aboutsummaryrefslogtreecommitdiff
path: root/docker/murano
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-28 09:42:43 +0000
committerGerrit Code Review <review@openstack.org>2015-09-28 09:42:43 +0000
commit5b482b68c289948a747a21b6a1510990bf337990 (patch)
tree62187c7b7c8e7a4efe44382cce3966abb383e94f /docker/murano
parent385658b77662a06ae7b0eb7320897be13065cbd0 (diff)
parent39aba34b2a884887cab117ff233469051cc2ec22 (diff)
downloadkolla-5b482b68c289948a747a21b6a1510990bf337990.tar.gz
kolla-5b482b68c289948a747a21b6a1510990bf337990.zip
Merge "Remove all fail sections for Ubuntu"
Diffstat (limited to 'docker/murano')
-rw-r--r--docker/murano/murano-base/Dockerfile.j27
1 files changed, 1 insertions, 6 deletions
diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2
index 6564a8765..a05eb6fb8 100644
--- a/docker/murano/murano-base/Dockerfile.j2
+++ b/docker/murano/murano-base/Dockerfile.j2
@@ -1,12 +1,7 @@
FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla)
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
- && /bin/false
-
-{% elif install_type == 'source' %}
+{% if install_type == 'source' %}
ADD murano-base-archive /murano-base-source
RUN ln -s murano-base-source/* murano \