diff options
| author | Zuul <zuul@review.opendev.org> | 2020-08-10 17:52:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-08-10 17:52:00 +0000 |
| commit | fd60c657101167b056177ae95aa2c695f14a93d4 (patch) | |
| tree | df61e63de4539721bbafca2e6eb224b019c99a73 /docker/placement | |
| parent | 7f4a32e1a38b7887c165b88d6ea3c31cef29abca (diff) | |
| parent | 5bdf514645e6ba603f813f299c68ff7fb12daa3c (diff) | |
| download | kolla-fd60c657101167b056177ae95aa2c695f14a93d4.tar.gz kolla-fd60c657101167b056177ae95aa2c695f14a93d4.zip | |
Merge "Refactor httpd install to base image"
Diffstat (limited to 'docker/placement')
| -rw-r--r-- | docker/placement/placement-api/Dockerfile.j2 | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/docker/placement/placement-api/Dockerfile.j2 b/docker/placement/placement-api/Dockerfile.j2 index 01e32c196..c91179c59 100644 --- a/docker/placement/placement-api/Dockerfile.j2 +++ b/docker/placement/placement-api/Dockerfile.j2 @@ -11,52 +11,26 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set placement_api_packages = [ - 'httpd', - 'mod_ssl', - 'openstack-placement-api', - 'python3-mod_wsgi' + 'openstack-placement-api' ] %} {{ macros.install_packages(placement_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_package_type == 'deb' %} {% set placement_api_packages = [ - 'apache2', - 'libapache2-mod-wsgi-py3', 'placement-api' ] %} {{ macros.install_packages(placement_api_packages | customizable("packages")) }} -RUN truncate -s 0 /etc/apache2/ports.conf \ - && rm -f /etc/apache2/sites-enabled/placement-api.conf +RUN rm -f /etc/apache2/sites-enabled/placement-api.conf {% endif %} {% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} - - {% set placement_api_packages = [ - 'httpd', - 'mod_ssl', - 'python3-mod_wsgi' - ] %} - -{{ macros.install_packages(placement_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_package_type == 'deb' %} - - {% set placement_api_packages = [ - 'apache2', - 'libapache2-mod-wsgi-py3' - ] %} + {% set placement_api_packages = [ + ] %} {{ macros.install_packages(placement_api_packages | customizable("packages")) }} -RUN truncate -s 0 /etc/apache2/ports.conf - - {% endif %} {% endif %} COPY extend_start.sh /usr/local/bin/kolla_placement_extend_start |