diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-07 09:50:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-07 09:50:31 +0000 |
| commit | ec835750e72c6a63e5e17dcae07b1fc6a3f8b466 (patch) | |
| tree | 3889b2e4daa78c8b944c65053e7121d10208fd98 /docker | |
| parent | 998210bcc1507951c6a92aa98e05ed8bb84a963a (diff) | |
| parent | 2dead815647b448bbcdc86bb2268f48d9a8d2515 (diff) | |
| download | kolla-ec835750e72c6a63e5e17dcae07b1fc6a3f8b466.tar.gz kolla-ec835750e72c6a63e5e17dcae07b1fc6a3f8b466.zip | |
Merge "Install agent dependencies from source for CentOS"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index fe073d8cf..8a48517d1 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -15,7 +15,16 @@ RUN pip install oslo.versionedobjects {% endif %} {% 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 \ iptables \ |