diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-12 13:54:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-12 13:54:33 +0000 |
| commit | bff91aecd996a7aa3def31f6365c033ef3141a1d (patch) | |
| tree | 7ba2cd44a2b7120d5ac59138aae005dc71ef3b5e | |
| parent | 7b389bc8d9742385dae984c62ce10b84abd62a6f (diff) | |
| parent | 38d1e58617717d9d81612ebab7a9783c552a69d4 (diff) | |
| download | kolla-bff91aecd996a7aa3def31f6365c033ef3141a1d.tar.gz kolla-bff91aecd996a7aa3def31f6365c033ef3141a1d.zip | |
Merge "Add Apache packages to ironic-pxe container"
| -rw-r--r-- | docker/ironic/ironic-pxe/Dockerfile.j2 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index 1ea8da88e..948f1347c 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -8,14 +8,18 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set ironic_pxe_packages = [ 'tftp-server', - 'syslinux-tftpboot' + 'syslinux-tftpboot', + 'httpd', + 'mod_wsgi' ] %} {% elif base_distro in ['ubuntu', 'debian'] %} {% set ironic_pxe_packages = [ 'tftpd-hpa', 'syslinux-common', 'syslinux', - 'pxelinux' + 'pxelinux', + 'apache2', + 'libapache2-mod-wsgi' ] %} {% endif %} |