diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-24 08:57:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-24 08:57:35 +0000 |
| commit | cc0343e305256b7fa0b96604920a1f24b7cd4dca (patch) | |
| tree | a44eedab8d36a05f791db64458083eeeb21d34e7 | |
| parent | 9d5945b6863f343056cc52e5ade06825b5630daa (diff) | |
| parent | cbdee3bd0b181c121fef8daa8ac8f4cfb3269a9b (diff) | |
| download | kolla-cc0343e305256b7fa0b96604920a1f24b7cd4dca.tar.gz kolla-cc0343e305256b7fa0b96604920a1f24b7cd4dca.zip | |
Merge "Ubuntu - OpenVSwitch"
| -rw-r--r-- | docker_templates/openvswitch/ovs-base/Dockerfile.j2 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docker_templates/openvswitch/ovs-base/Dockerfile.j2 b/docker_templates/openvswitch/ovs-base/Dockerfile.j2 index f1e00e5d0..fd8eac1af 100644 --- a/docker_templates/openvswitch/ovs-base/Dockerfile.j2 +++ b/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 %} |