From 38d1e58617717d9d81612ebab7a9783c552a69d4 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 11 Jan 2017 14:00:22 -0500 Subject: Add Apache packages to ironic-pxe container Some projects that use Kolla docker containers (TripleO) run Ironic pxe under httpd. This patch adds the httpd package so that it exists in the container and can optionally by used via Docker entrypoints. As many of these projects do not require the use of Apache (it is opt-in) at this point not all deployment frameworks support the use of it so the existing configuration defaults have been left as-is for now. Change-Id: I4c3e44db6a1ffa7238006c27038ac0a67c8aa725 Partial-Blueprint: apache-packages-for-apis --- docker/ironic/ironic-pxe/Dockerfile.j2 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'docker') 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 %} -- cgit v1.2.3