openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix Ubuntu binary build and deploy gate"

Browse Source
This commit is contained in:
Jenkins 2016-08-24 11:46:27 +00:00 committed by Gerrit Code Review
commit 0d661a1e59
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/designate/designate-sink/Dockerfile.j2
View File

@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set designate_sink_packages = [ {% set designate_sink_packages = [
'designate-sink', 'designate-sink',
'designateclient' 'python-designateclient'
] %} ] %}
{% endif %} {% endif %}
{{ macros.install_packages(designate_sink_packages | customizable("packages")) }} {{ macros.install_packages(designate_sink_packages | customizable("packages")) }}

3
docker/keystone/Dockerfile.j2
View File

@ -32,7 +32,8 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
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/main \
&& cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/admin \ && 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 %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}

1
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -15,6 +15,7 @@ RUN yum -y install \
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \ RUN apt-get -y install --no-install-recommends \
iproute2 \
neutron-plugin-ml2 \ neutron-plugin-ml2 \
neutron-server \ neutron-server \
openvswitch-switch \ openvswitch-switch \

5
tests/test_build.py
View File

@ -89,9 +89,12 @@ class BuildTestCentosSource(BuildTest, base.BaseTestCase):
class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase): class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase):
excluded_images = ["neutron-networking-sfc-agent", excluded_images = ["kuryr",
"neutron-networking-sfc-agent",
"senlin-base",
"vmtp", "vmtp",
"zaqar", "zaqar",
"watcher-base",
"congress-base"] "congress-base"]
def setUp(self): def setUp(self):