From 2a1c25d6e3ba9c96deb82f4329898246784af6a0 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Date: Mon, 22 Aug 2016 16:49:51 +0800
Subject: [PATCH] Fix Ubuntu binary build and deploy gate

Signed-off-by: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Closes-Bug: #1616349
Change-Id: I82a245474392d22017faf30fa89d6dc5e01ab2c2
---
 docker/designate/designate-sink/Dockerfile.j2 | 2 +-
 docker/keystone/Dockerfile.j2                 | 3 ++-
 docker/neutron/neutron-base/Dockerfile.j2     | 1 +
 tests/test_build.py                           | 5 ++++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2
index 4c1821c9c3..9d0ff85fa0 100644
--- a/docker/designate/designate-sink/Dockerfile.j2
+++ b/docker/designate/designate-sink/Dockerfile.j2
@@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
     {% elif base_distro in ['ubuntu'] %}
        {% set designate_sink_packages = [
             'designate-sink',
-            'designateclient'
+            'python-designateclient'
         ] %}
     {% endif %}
 {{ macros.install_packages(designate_sink_packages | customizable("packages")) }}
diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2
index d499dbbafd..e4a37baab6 100644
--- a/docker/keystone/Dockerfile.j2
+++ b/docker/keystone/Dockerfile.j2
@@ -32,7 +32,8 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
 RUN mkdir -p /var/www/cgi-bin/keystone \
     && cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/main \
     && cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/admin \
-    && echo > /etc/apache2/ports.conf
+    && echo > /etc/apache2/ports.conf \
+    && rm /etc/apache2/sites-enabled/keystone.conf
 
     {% endif %}
 {% elif install_type == 'source' %}
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index a30ea45f56..e5f9de390a 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -15,6 +15,7 @@ RUN yum -y install \
     {% elif base_distro in ['ubuntu'] %}
 
 RUN apt-get -y install --no-install-recommends \
+        iproute2 \
         neutron-plugin-ml2 \
         neutron-server \
         openvswitch-switch \
diff --git a/tests/test_build.py b/tests/test_build.py
index d0ea83813f..77cd2a2f5b 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -91,9 +91,12 @@ class BuildTestCentosSource(BuildTest, base.BaseTestCase):
 
 
 class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase):
-    excluded_images = ["neutron-networking-sfc-agent",
+    excluded_images = ["kuryr",
+                       "neutron-networking-sfc-agent",
+                       "senlin-base",
                        "vmtp",
                        "zaqar",
+                       "watcher-base",
                        "congress-base"]
 
     def setUp(self):