diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-28 09:42:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-28 09:42:43 +0000 |
| commit | 5b482b68c289948a747a21b6a1510990bf337990 (patch) | |
| tree | 62187c7b7c8e7a4efe44382cce3966abb383e94f /docker/ceilometer | |
| parent | 385658b77662a06ae7b0eb7320897be13065cbd0 (diff) | |
| parent | 39aba34b2a884887cab117ff233469051cc2ec22 (diff) | |
| download | kolla-5b482b68c289948a747a21b6a1510990bf337990.tar.gz kolla-5b482b68c289948a747a21b6a1510990bf337990.zip | |
Merge "Remove all fail sections for Ubuntu"
Diffstat (limited to 'docker/ceilometer')
| -rw-r--r-- | docker/ceilometer/ceilometer-base/Dockerfile.j2 | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 8a469d43f..43c399a8d 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -1,14 +1,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -{% if install_type == 'binary' %} - {% if base_distro in ['ubuntu', 'debian'] %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - - {% endif %} -{% elif install_type == 'source' %} +{% if install_type == 'source' %} ADD ceilometer-base-archive /ceilometer-base-source RUN ln -s ceilometer-base-source/* ceilometer \ |