Merge "Fix Ubuntu binary build and deploy gate"

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")) }}

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' %}

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 \

tests/test_build.py

@@ -89,9 +89,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):