openstack/kolla-ansible
Code Issues Proposed changes

Ubuntu - OpenVSwitch

Browse Source 
Change-Id: I235c5d2b50048f9c46c36953fabdd7a1ffa40afd
Partially-Implements: blueprint install-from-ubuntu
This commit is contained in:
Sam Yaple 2015-08-22 14:10:25 +00:00
parent f70e8d4598
commit cbdee3bd0b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker_templates/openvswitch/ovs-base/Dockerfile.j2
View File

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