Merge "implement panko api for ubuntu binary"

This commit is contained in:
Jenkins 2017-07-20 10:03:08 +00:00 committed by Gerrit Code Review
commit 252dd734df
3 changed files with 10 additions and 9 deletions

View File

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

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 \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% set panko_base_packages = [
'apache2',
'libapache2-mod-wsgi'
] %}
{{ macros.install_packages(panko_base_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}

View File

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