diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-28 13:57:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-28 13:57:00 +0000 |
| commit | 6b9a4381a0f7407d57b9627b1b9371f77ac22a88 (patch) | |
| tree | 19135e11940f2e9793a0d9a44534f08e89d9d57a /docker/ironic | |
| parent | 801afbf173b1502261a937aca9866f8eb2679fb6 (diff) | |
| parent | 9df58642c62387acda2bba11f5423c45bf69399d (diff) | |
| download | kolla-6b9a4381a0f7407d57b9627b1b9371f77ac22a88.tar.gz kolla-6b9a4381a0f7407d57b9627b1b9371f77ac22a88.zip | |
Merge "RHEL: Add mod_ssl for services running over httpd"
Diffstat (limited to 'docker/ironic')
| -rw-r--r-- | docker/ironic/ironic-pxe/Dockerfile.j2 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index 658a83d63..79e71393d 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -11,10 +11,12 @@ MAINTAINER {{ maintainer }} 'syslinux-tftpboot', 'httpd', 'ipxe-bootimgs', - 'mod_wsgi' + 'mod_wsgi', + 'mod_ssl' ] %} {{ macros.install_packages(ironic_pxe_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', 'debian'] %} {% set ironic_pxe_packages = [ 'tftpd-hpa', |