openstack/kolla-ansible
Code Issues Proposed changes

Merge "Install agent dependencies from source for CentOS"

Browse Source
This commit is contained in:
Jenkins 2015-10-07 09:50:31 +00:00 committed by Gerrit Code Review
commit ec835750e7
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -15,7 +15,16 @@ RUN pip install oslo.versionedobjects
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['ubuntu', 'debian'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
uuid \
dnsmasq \
ipset \
openvswitch \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
iptables \ iptables \