aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-24 17:01:29 +0000
committerGerrit Code Review <review@openstack.org>2017-01-24 17:01:29 +0000
commita29a5ad919d79ecbb6b180723ce5afe675c5780e (patch)
treeec8ecb8481718626eab5ef25db2c6c2b73baaf62
parentd025182ed59ae79c98f0e1fd97f27a001fa4580c (diff)
parent89b546d9aa72ca2dc310766ea95e7f8739aae061 (diff)
downloadkolla-a29a5ad919d79ecbb6b180723ce5afe675c5780e.tar.gz
kolla-a29a5ad919d79ecbb6b180723ce5afe675c5780e.zip
Merge "Add ipxe packages to Ironic PXE container"
-rw-r--r--docker/ironic/ironic-pxe/Dockerfile.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2
index 948f1347c..accfeaff2 100644
--- a/docker/ironic/ironic-pxe/Dockerfile.j2
+++ b/docker/ironic/ironic-pxe/Dockerfile.j2
@@ -10,6 +10,7 @@ MAINTAINER {{ maintainer }}
'tftp-server',
'syslinux-tftpboot',
'httpd',
+ 'ipxe-bootimgs',
'mod_wsgi'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
@@ -19,6 +20,7 @@ MAINTAINER {{ maintainer }}
'syslinux',
'pxelinux',
'apache2',
+ 'ipxe',
'libapache2-mod-wsgi'
] %}
{% endif %}