diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-26 13:35:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-26 13:35:03 +0000 |
| commit | 7140bead4bfbff411b6b62eeebb77650a6479916 (patch) | |
| tree | 7f97f2bc885a515ab6b2927e43bdd9308da1ea95 /docker/ceilometer/ceilometer-api/Dockerfile.j2 | |
| parent | a9190021ab646c85acbc707c879f7aa3aa8f30cc (diff) | |
| parent | 7555054e7274f167f53591e15d19e85ef2dec34c (diff) | |
| download | kolla-7140bead4bfbff411b6b62eeebb77650a6479916.tar.gz kolla-7140bead4bfbff411b6b62eeebb77650a6479916.zip | |
Merge "Fix the failure of ceilometer-api container"
Diffstat (limited to 'docker/ceilometer/ceilometer-api/Dockerfile.j2')
| -rw-r--r-- | docker/ceilometer/ceilometer-api/Dockerfile.j2 | 48 |
1 files changed, 44 insertions, 4 deletions
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index 422ecefc1..b279a4c0b 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2 @@ -7,13 +7,55 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - {% set ceilometer_api_packages = ['openstack-ceilometer-api'] %} + {% set ceilometer_api_packages = [ + 'openstack-ceilometer-api', + 'httpd', + 'mod_wsgi' + ] %} +{{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }} +RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf {% elif base_distro in ['ubuntu'] %} - {% set ceilometer_api_packages = ['ceilometer-api'] %} + {% set ceilometer_api_packages = [ + 'ceilometer-api', + 'apache2', + 'libapache2-mod-wsgi' + ] %} +{{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }} +RUN echo > /etc/apache2/ports.conf {% endif %} + +{% elif install_type == 'source' %} + + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + + {% set ceilometer_api_packages = [ + 'httpd', + 'mod_wsgi', + '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 +{% endblock %} + + {% elif base_distro in ['ubuntu', 'debian'] %} + + {% set ceilometer_api_packages = [ + 'apache2', + 'libapache2-mod-wsgi', + 'gettext' + ] %} + +{{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }} + +{% block ceilometer_api_ubuntu_source_setup %} +RUN echo > /etc/apache2/ports.conf +{% endblock %} + {% endif %} + {% endif %} COPY extend_start.sh /usr/local/bin/kolla_ceilometer_extend_start @@ -22,5 +64,3 @@ RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start {% block ceilometer_api_footer %}{% endblock %} {% block footer %}{% endblock %} {{ include_footer }} - -USER ceilometer |