diff options
| author | Vladislav Belogrudov <vladislav.belogrudov@oracle.com> | 2015-09-01 12:28:40 +0300 |
|---|---|---|
| committer | Vladislav Belogrudov <vladislav.belogrudov@oracle.com> | 2015-09-02 11:38:21 +0300 |
| commit | f24e80d7e6f54245744c297c5c05e50b2e348397 (patch) | |
| tree | 152cc6476fd2bee8fa477d3ae90afba31c0fc766 /docker | |
| parent | 6668900e7193000628496630389a142a61aa51ea (diff) | |
| download | kolla-f24e80d7e6f54245744c297c5c05e50b2e348397.tar.gz kolla-f24e80d7e6f54245744c297c5c05e50b2e348397.zip | |
Source based builds should get novnc from tarball (git/url)
Source based centos, fedora and oraclelinux install novnc via
rdo repository while ubuntu and debian get novnc from github.
oraclelinux source build cannot use rdo, also using novnc tarballs
can be expanded to all distros.
Change-Id: I236dd5c36380e0592fceae4f4e1c28fe97dec1e7
Closes-Bug: #1490893
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 / |