Skip to content

Commit ee4593f

Browse files
committed
Remove wait-iptables-init.service
Code to wait for iptables to start was added (to startironic.sh) in the RHEL 7 era. We kept it because we were not sure it was still needed. We now know that when oneshot systemd services are restarted, it prevents any of the services that depend on them from starting. It follows that the wait-iptables-init service is not having any effect today in RHEL 9, so it can be removed.
1 parent ea2f3a1 commit ee4593f

File tree

4 files changed

+6
-22
lines changed

4 files changed

+6
-22
lines changed

data/data/bootstrap/baremetal/files/etc/containers/systemd/ironic-dnsmasq.container

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Description=DHCP Service for Provisioning Network
33
BindsTo=ironic-volume.service
44
Requires=build-ironic-env.service provisioning-interface.service
55
PartOf=ironic.service
6-
Wants=network-online.target wait-iptables-init.service
7-
After=network-online.target ironic-volume.service build-ironic-env.service provisioning-interface.service wait-iptables-init.service
6+
Wants=network-online.target
7+
After=network-online.target ironic-volume.service build-ironic-env.service provisioning-interface.service
88

99
[Container]
1010
ContainerName=dnsmasq

data/data/bootstrap/baremetal/files/etc/containers/systemd/ironic-httpd.container.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[Unit]
22
Description=HTTP Server for Ironic
33
BindsTo=ironic-volume.service
4-
Requires=build-ironic-env.service wait-iptables-init.service
4+
Requires=build-ironic-env.service
55
PartOf=ironic.service
66
Wants=network-online.target
7-
After=network-online.target ironic-volume.service build-ironic-env.service extract-machine-os.service provisioning-interface.service wait-iptables-init.service
7+
After=network-online.target ironic-volume.service build-ironic-env.service extract-machine-os.service provisioning-interface.service
88

99
[Container]
1010
ContainerName=httpd

data/data/bootstrap/baremetal/files/etc/containers/systemd/ironic.container.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[Unit]
22
Description=Ironic baremetal deployment service
33
BindsTo=ironic-volume.service
4-
Requires=build-ironic-env.service wait-iptables-init.service
4+
Requires=build-ironic-env.service
55
{{ if .PlatformData.BareMetal.ProvisioningIP }}
66
Requires=provisioning-interface.service
77
{{ end }}
88
{{ if .PlatformData.BareMetal.ProvisioningDNSMasq }}
99
Wants=ironic-dnsmasq.service
1010
{{ end }}
1111
Wants=network-online.target ironic-httpd.service ironic-ramdisk-logs.service extract-machine-os.service
12-
After=network-online.target ironic-volume.service build-ironic-env.service wait-iptables-init.service provisioning-interface.service ironic-dnsmasq.service extract-machine-os.service
12+
After=network-online.target ironic-volume.service build-ironic-env.service provisioning-interface.service ironic-dnsmasq.service extract-machine-os.service
1313

1414
[Container]
1515
ContainerName=ironic

data/data/bootstrap/baremetal/systemd/units/wait-iptables-init.service

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)