diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-24 11:46:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-24 11:46:27 +0000 |
| commit | 0d661a1e59c6557448dbf3ff9d48c50a7a54524d (patch) | |
| tree | 975a728abd196cc1995be1d63c96265d535d679c | |
| parent | d8755e173ff6744e13fa73cbc4ed6b384c51a3e3 (diff) | |
| parent | 2a1c25d6e3ba9c96deb82f4329898246784af6a0 (diff) | |
| download | kolla-0d661a1e59c6557448dbf3ff9d48c50a7a54524d.tar.gz kolla-0d661a1e59c6557448dbf3ff9d48c50a7a54524d.zip | |
Merge "Fix Ubuntu binary build and deploy gate"
| -rw-r--r-- | docker/designate/designate-sink/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/keystone/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | 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 4c1821c9c..9d0ff85fa 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 d499dbbaf..e4a37baab 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 a30ea45f5..e5f9de390 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 985b124aa..6325b213e 100644 --- a/tests/test_build.py +++ b/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): |