diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-18 20:10:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-18 20:10:24 +0000 |
| commit | b0cd947c7ae5222e49aa13ff12851fb9b817efe7 (patch) | |
| tree | 897171af517b03c751112872942871b10f0b34d5 /docker | |
| parent | 4b107aff5f46976ef1d5ba8ffd387e8f25091c55 (diff) | |
| parent | aec595f7f71b4353a7ca577979606eb8779c958f (diff) | |
| download | kolla-b0cd947c7ae5222e49aa13ff12851fb9b817efe7.tar.gz kolla-b0cd947c7ae5222e49aa13ff12851fb9b817efe7.zip | |
Merge "Fix broken centos-source- build: add rdo repository"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 8 | ||||
| -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 | ||||
| -rw-r--r-- | docker/openvswitch/ovs-base/Dockerfile.j2 | 7 |
5 files changed, 12 insertions, 15 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index ceb51a94b..61a3f9733 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -153,6 +153,14 @@ RUN yum install -y \ # Endif for install_type binary {% elif install_type == 'source' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + +# Set up repositories +RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm \ + && yum clean all + + {% endif %} + # Update packages RUN yum update -y \ && yum install -y \ 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 diff --git a/docker/openvswitch/ovs-base/Dockerfile.j2 b/docker/openvswitch/ovs-base/Dockerfile.j2 index 4958297c0..05e5b1892 100644 --- a/docker/openvswitch/ovs-base/Dockerfile.j2 +++ b/docker/openvswitch/ovs-base/Dockerfile.j2 @@ -2,13 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - {% if install_type == 'source' %} - - # TODO(sdake): groan openvswitch is only in the RDO repos -RUN yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \ - && yum clean all - - {% endif %} RUN yum install -y \ openvswitch \ |