Merge "Ubuntu - OpenVSwitch"

docker_templates/openvswitch/ovs-base/Dockerfile.j2

@@ -2,11 +2,12 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+    {% if install_type == 'source' %}
 
     # TODO(sdake): groan openvswitch is only in the RDO repos
-    {% if install_type == 'source' %}
 RUN yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \
     && yum clean all
+
     {% endif %}
 
 RUN yum install -y \
@@ -15,7 +16,7 @@ RUN yum install -y \
 
 {% elif base_distro in ['ubuntu', 'debian'] %}
 
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
+RUN apt-get install -y --no-install-recommends openvswitch-switch \
+    && apt-get clean
 
 {% endif %}