diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-03 18:29:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-03 18:29:05 +0000 |
| commit | ae202c2fadb6abda97b248bc4d07a4c9560555d7 (patch) | |
| tree | a9676643b97e351a85ce91f01ab1db38a0c19eb3 | |
| parent | 816da386056297ca872cfc593405ccaf5e6d72f9 (diff) | |
| parent | 30aa0af69af3de569fa301c7d2ab0906b00f718b (diff) | |
| download | kolla-ae202c2fadb6abda97b248bc4d07a4c9560555d7.tar.gz kolla-ae202c2fadb6abda97b248bc4d07a4c9560555d7.zip | |
Merge "Make nova-spice5htmlproxy build on RDO"
| -rw-r--r-- | docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index 2397e68d0..48646afce 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -4,8 +4,8 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN echo 'ERROR: The specified distro has no Kolla images to build: "{{ base_distro }}"' \ - && /bin/false +RUN yum -y install openstack-nova-spicehtml5proxy \ + && yum clean all {% endif %} {% elif install_type == 'source' %} |