diff options
| author | Vladislav Belogrudov <vladislav.belogrudov@oracle.com> | 2015-09-16 10:34:28 +0300 |
|---|---|---|
| committer | Vladislav Belogrudov <vladislav.belogrudov@oracle.com> | 2015-09-17 16:58:07 +0300 |
| commit | aec595f7f71b4353a7ca577979606eb8779c958f (patch) | |
| tree | 4a39ca5430041f3a20a6de0a7d5e41a0f545c592 /docker/neutron | |
| parent | 172103749ea8313631f29cd816a531d4e4c275d0 (diff) | |
| download | kolla-aec595f7f71b4353a7ca577979606eb8779c958f.tar.gz kolla-aec595f7f71b4353a7ca577979606eb8779c958f.zip | |
Fix broken centos-source- build: add rdo repository
openvswitch requires rdo repository to be installed
Change-Id: I173bb3d32bcef2b890ab482083b0ffb830c3b7fb
Closes-Bug: #1495470
Diffstat (limited to 'docker/neutron')
| -rw-r--r-- | docker/neutron/neutron-agents/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/docker/neutron/neutron-agents/Dockerfile.j2 b/docker/neutron/neutron-agents/Dockerfile.j2 index 9fca4f9c9..58d2b6d05 100644 --- a/docker/neutron/neutron-agents/Dockerfile.j2 +++ b/docker/neutron/neutron-agents/Dockerfile.j2 @@ -3,7 +3,9 @@ MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN yum install -y supervisor \ +RUN yum install -y \ + openvswitch \ + supervisor \ && yum clean all COPY supervisord.conf /etc/ diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 01eb3fef1..e9a6ffb11 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -20,11 +20,7 @@ RUN echo '{{ install_type}} not yet available for {{ base_distro }}' \ {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install openvswitch - - {% elif base_distro in ['ubuntu', 'debian'] %} + {% if base_distro in ['ubuntu', 'debian'] %} RUN apt-get install -y --no-install-recommends \ iptables \ diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index 9c0d45b27..baab4ee37 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -16,8 +16,6 @@ RUN yum install -y \ # Install required packages RUN yum install -y \ - #TODO: will be addressed later - https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \ openvswitch \ && yum clean all |