aboutsummaryrefslogtreecommitdiff
path: root/docker/ironic
diff options
context:
space:
mode:
authorJames Kirsch <generalfuzz@gmail.com>2020-07-30 12:36:39 -0700
committerMark Goddard <mark@stackhpc.com>2020-08-10 09:51:07 +0000
commit5bdf514645e6ba603f813f299c68ff7fb12daa3c (patch)
tree2bd0ed0e4f532575e59e646657afd33a0affe35d /docker/ironic
parent69092eb574222564fcd3ce752a41db7fe51d61b8 (diff)
downloadkolla-5bdf514645e6ba603f813f299c68ff7fb12daa3c.tar.gz
kolla-5bdf514645e6ba603f813f299c68ff7fb12daa3c.zip
Refactor httpd install to base image
Refactor installing and initial setup of httpd and mod wsgi from individual services to base image. Change-Id: I651a55a9ebe258ef403d33de010a4dfb368a4021
Diffstat (limited to 'docker/ironic')
-rw-r--r--docker/ironic/ironic-api/Dockerfile.j235
-rw-r--r--docker/ironic/ironic-pxe/Dockerfile.j28
2 files changed, 5 insertions, 38 deletions
diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2
index f6634a3b4..799a0c2d7 100644
--- a/docker/ironic/ironic-api/Dockerfile.j2
+++ b/docker/ironic/ironic-api/Dockerfile.j2
@@ -10,44 +10,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set ironic_api_packages = [
- 'httpd',
- 'mod_ssl',
- 'openstack-ironic-api',
- 'python3-mod_wsgi',
+ 'openstack-ironic-api'
] %}
{% elif base_package_type == 'deb' %}
{% set ironic_api_packages = [
- 'apache2',
- 'ironic-api',
- 'libapache2-mod-wsgi-py3'
+ 'ironic-api'
] %}
{% endif %}
-
+{{ macros.install_packages(ironic_api_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
- {% if base_package_type == 'rpm' %}
- {% set ironic_api_packages = [
- 'httpd',
- 'mod_ssl',
- 'python3-mod_wsgi',
- ] %}
- {% elif base_package_type == 'deb' %}
- {% set ironic_api_packages = [
- 'apache2',
- 'libapache2-mod-wsgi-py3'
- ] %}
- {% endif %}
-
-{% endif %}
+ {% set ironic_api_packages = [
+ ] %}
{{ macros.install_packages(ironic_api_packages | customizable("packages")) }}
-
-{% if base_package_type == 'rpm' %}
-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' %}
-RUN echo > /etc/apache2/ports.conf
-
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2
index 52b940bf4..10b8f6279 100644
--- a/docker/ironic/ironic-pxe/Dockerfile.j2
+++ b/docker/ironic/ironic-pxe/Dockerfile.j2
@@ -9,10 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}
{% set ironic_pxe_packages = [
- 'httpd',
'ipxe-bootimgs',
- 'mod_ssl',
- 'python3-mod_wsgi',
'tftp-server',
] %}
@@ -31,13 +28,9 @@ ENV ironic_arch=aarch64
{% endif %}
{{ macros.install_packages(ironic_pxe_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 ironic_pxe_packages = [
- 'apache2',
'ipxe',
- 'libapache2-mod-wsgi-py3',
'pxelinux',
'syslinux-common',
'tftpd-hpa'
@@ -55,7 +48,6 @@ ENV ironic_arch=aarch64
{% endif %}
{{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }}
-RUN echo > /etc/apache2/ports.conf
{% endif %}
COPY tftp-map-file /map-file