Merge "Source based builds should get novnc from tarball (git/url)"

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 /