openstack/kolla
Code Issues Proposed changes

implement panko api for ubuntu binary

Browse Source 
Change-Id: I34ea4097be491c70e5fa183ee7d505885d7d7c3c
This commit is contained in:
Jeffrey Zhang 2017-07-18 15:17:18 +08:00 committed by Jeffrey Zhang
parent 14885f1f2b
commit 68826b64e2
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/panko/panko-api/Dockerfile.j2
View File

@ -13,9 +13,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set panko_api_packages = [
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ 'panko-api',
&& /bin/false 'python-pymongo'
] %}
{% endif %} {% endif %}
{{ macros.install_packages(panko_api_packages | customizable("packages")) }} {{ macros.install_packages(panko_api_packages | customizable("packages")) }}

10
docker/panko/panko-base/Dockerfile.j2
View File

@ -22,10 +22,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set panko_base_packages = [
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ 'apache2',
&& /bin/false 'libapache2-mod-wsgi'
] %}
{{ macros.install_packages(panko_base_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}

2
tests/test_build.py
View File

@ -128,7 +128,6 @@ class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase):
"monasca-base", "monasca-base",
"novajoin-base", "novajoin-base",
"octavia-base", "octavia-base",
"panko-base",
"searchlight-base", "searchlight-base",
"senlin-base", "senlin-base",
"solum-base", "solum-base",
@ -173,7 +172,6 @@ class BuildTestDebianBinary(BuildTest, base.BaseTestCase):
"monasca-base", "monasca-base",
"novajoin-base", "novajoin-base",
"octavia-base", "octavia-base",
"panko-base",
"searchlight-base", "searchlight-base",
"senlin-base", "senlin-base",
"sensu-base", "sensu-base",