aboutsummaryrefslogtreecommitdiff
path: root/docker/cloudkitty/cloudkitty-api/Dockerfile.j2
diff options
context:
space:
mode:
authorZhongShengping <chdzsp@163.com>2017-08-24 11:03:12 +0800
committerZhongShengping <chdzsp@163.com>2017-08-31 08:50:39 +0800
commit14df9701b59d2d899b2d0a505d729a9850c62a98 (patch)
treee7b7aa4fe8d7e1a0011d351df69ca892415185a9 /docker/cloudkitty/cloudkitty-api/Dockerfile.j2
parent7b3e9c595cd5a3d838ba6178711356f45e4e5f25 (diff)
downloadkolla-14df9701b59d2d899b2d0a505d729a9850c62a98.tar.gz
kolla-14df9701b59d2d899b2d0a505d729a9850c62a98.zip
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
Diffstat (limited to 'docker/cloudkitty/cloudkitty-api/Dockerfile.j2')
-rw-r--r--docker/cloudkitty/cloudkitty-api/Dockerfile.j230
1 files changed, 27 insertions, 3 deletions
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