From 14df9701b59d2d899b2d0a505d729a9850c62a98 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Thu, 24 Aug 2017 11:03:12 +0800 Subject: Add WSGI support for cloudkitty-api They dropped the cloudkitty-api command line[0], so we should add wsgi support for cloudkitty-api. [0]https://review.openstack.org/#/c/366043/ Change-Id: Ie6a08831f8c0bcf3051f01fccc9e3662f36b03ca Closes-Bug: #1713879 --- docker/cloudkitty/cloudkitty-api/Dockerfile.j2 | 30 +++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'docker/cloudkitty/cloudkitty-api/Dockerfile.j2') diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index 2e4442906..e8ff0700c 100644 --- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -9,8 +9,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set cloudkitty_api_packages = [ + 'httpd', + 'mod_ssl', + 'mod_wsgi', 'openstack-cloudkitty-api', ] %} +{{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }} +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'] %} @@ -19,14 +25,32 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} -{% endif %} +{% elif install_type == 'source' %} + + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set cloudkitty_api_packages = [ + 'httpd', + 'mod_ssl', + 'mod_wsgi' + ] %} +{{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }} +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 ['ubuntu', 'debian'] %} + {% set cloudkitty_api_packages = [ + 'apache2', + 'libapache2-mod-wsgi' + ] %} {{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }} +RUN echo > /etc/apache2/ports.conf + + {% endif %} + +{% endif %} COPY extend_start.sh /usr/local/bin/kolla_cloudkitty_extend_start RUN chmod 755 /usr/local/bin/kolla_cloudkitty_extend_start {% block cloudkitty_api_footer %}{% endblock %} {% block footer %}{% endblock %} - -USER cloudkitty -- cgit v1.2.3