diff options
Diffstat (limited to 'docker/ceilometer')
| -rw-r--r-- | docker/ceilometer/ceilometer-api/Dockerfile.j2 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index 885155e74..69716b2dc 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2 @@ -10,10 +10,12 @@ MAINTAINER {{ maintainer }} {% set ceilometer_api_packages = [ 'openstack-ceilometer-api', 'httpd', - 'mod_wsgi' + 'mod_wsgi', + 'mod_ssl' ] %} {{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }} -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 {% elif base_distro in ['ubuntu'] %} {% set ceilometer_api_packages = [ 'ceilometer-api', @@ -32,13 +34,15 @@ RUN echo > /etc/apache2/ports.conf {% set ceilometer_api_packages = [ 'httpd', 'mod_wsgi', + 'mod_ssl', 'gettext' ] %} {{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }} {% block ceilometer_api_redhat_source_setup %} -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 {% endblock %} {% elif base_distro in ['ubuntu', 'debian'] %} |