From aec595f7f71b4353a7ca577979606eb8779c958f Mon Sep 17 00:00:00 2001
From: Vladislav Belogrudov <vladislav.belogrudov@oracle.com>
Date: Wed, 16 Sep 2015 10:34:28 +0300
Subject: [PATCH] Fix broken centos-source- build: add rdo repository

openvswitch requires rdo repository to be installed

Change-Id: I173bb3d32bcef2b890ab482083b0ffb830c3b7fb
Closes-Bug: #1495470
---
 docker/base/Dockerfile.j2                              | 8 ++++++++
 docker/neutron/neutron-agents/Dockerfile.j2            | 4 +++-
 docker/neutron/neutron-base/Dockerfile.j2              | 6 +-----
 docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 | 2 --
 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 26bb55addd..4c215d1d46 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 9fca4f9c90..58d2b6d059 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 01eb3fef15..e9a6ffb113 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 9c0d45b276..baab4ee37f 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 4958297c01..05e5b18922 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 \