diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-02 09:32:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-02 09:32:12 +0000 |
| commit | 34937175172e44ed67d271f74540b7f5e0de7c6d (patch) | |
| tree | d0508f054bed0c7e42f0dce44066e9db6dd264e1 /docker | |
| parent | 93b8d5b026c6d772258f3d8da9c20e27140053f9 (diff) | |
| parent | f24e80d7e6f54245744c297c5c05e50b2e348397 (diff) | |
| download | kolla-34937175172e44ed67d271f74540b7f5e0de7c6d.tar.gz kolla-34937175172e44ed67d271f74540b7f5e0de7c6d.zip | |
Merge "Source based builds should get novnc from tarball (git/url)"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-novncproxy/Dockerfile.j2 | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2 index f7d25338e..a2fcf98cc 100644 --- a/docker/nova/nova-novncproxy/Dockerfile.j2 +++ b/docker/nova/nova-novncproxy/Dockerfile.j2 @@ -11,19 +11,10 @@ RUN yum -y install \ {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} - -RUN yum -y install \ - https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \ - novnc \ - && yum clean all - - {% elif base_distro in ['ubuntu', 'debian'] %} ADD nova-novncproxy.tar / RUN ln -s /kanaka-noVNC-* /usr/share/novnc - {% endif %} {% endif %} COPY start.sh / |