Use native implementation to add listen for apache vhost

Currently the vhost management in ironic::pxe has its own logic to
inject the Listen option into the vhost configuration file instead of
the core apache configuration file but these two should be effectively
same as long as vhosts are properly configured.

Because we globally use the implementation in puppetlabs-apache which
adds Listen to the core file, this replaces own mechanism by that
existing implementation to simplify the own logics.

Change-Id: I1e979159116f25a404b5f081c02352a6f2412074
This commit is contained in:
Takashi Kajinami 2022-06-02 09:45:06 +09:00
parent c317250f96
commit a612ff0b67
1 changed files with 4 additions and 12 deletions

View File

@ -261,17 +261,9 @@ class ironic::pxe (
include apache
apache::vhost { 'ipxe_vhost':
priority => '10',
options => ['Indexes','FollowSymLinks'],
docroot => $http_root_real,
port => $http_port_real,
# FIXME: for backwards compatibility we have to add listen to the ipxe vhost
add_listen => false,
}
# FIXME: this can be removed after ipxe element is removed from instack-undercloud
concat::fragment { 'ipxe_vhost-listen':
target => '10-ipxe_vhost.conf',
order => 1337,
content => "Listen ${http_port_real}",
priority => '10',
options => ['Indexes','FollowSymLinks'],
docroot => $http_root_real,
port => $http_port_real,
}
}