diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2017-07-18 15:17:18 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2017-07-18 08:37:18 +0000 |
| commit | 68826b64e2740e78e8794cdd8547e45d3f7a79ef (patch) | |
| tree | 73bf31d2764fb04b5008ed33298fcfdaa5b840af | |
| parent | 14885f1f2b0cf43bfc77ee43d19b71821b8b793e (diff) | |
| download | kolla-68826b64e2740e78e8794cdd8547e45d3f7a79ef.tar.gz kolla-68826b64e2740e78e8794cdd8547e45d3f7a79ef.zip | |
implement panko api for ubuntu binary
Change-Id: I34ea4097be491c70e5fa183ee7d505885d7d7c3c
| -rw-r--r-- | docker/panko/panko-api/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | docker/panko/panko-base/Dockerfile.j2 | 10 | ||||
| -rw-r--r-- | tests/test_build.py | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/docker/panko/panko-api/Dockerfile.j2 b/docker/panko/panko-api/Dockerfile.j2 index c5dfcb678..565df5679 100644 --- a/docker/panko/panko-api/Dockerfile.j2 +++ b/docker/panko/panko-api/Dockerfile.j2 @@ -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")) }} diff --git a/docker/panko/panko-base/Dockerfile.j2 b/docker/panko/panko-base/Dockerfile.j2 index d84c02031..1623bf6ff 100644 --- a/docker/panko/panko-base/Dockerfile.j2 +++ b/docker/panko/panko-base/Dockerfile.j2 @@ -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'] %} diff --git a/tests/test_build.py b/tests/test_build.py index 49e074da7..881052f32 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -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", |