Merge pull request #8986 from zaneb/bootstrap-dependencies-cleanup

OCPBUGS-41567: Clean up baremetal bootstrap systemd dependencies

Author: openshift-merge-bot[bot]

data/data/bootstrap/baremetal/files/etc/containers/systemd/image-customization.container

@@ -1,9 +1,9 @@
 [Unit]
 Description=Customized Machine OS Image Server
 BindsTo=ironic-volume.service
-Requires=build-ironic-env.service extract-machine-os.service
+Requires=build-ironic-env.service
 PartOf=ironic.service
-Wants=network-online.target
+Wants=network-online.target extract-machine-os.service
 After=network-online.target ironic-volume.service build-ironic-env.service extract-machine-os.service
 
 [Container]

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

@@ -3,8 +3,8 @@ Description=DHCP Service for Provisioning Network
 BindsTo=ironic-volume.service
 Requires=build-ironic-env.service provisioning-interface.service
 PartOf=ironic.service
-Wants=network-online.target wait-iptables-init.service
-After=network-online.target ironic-volume.service build-ironic-env.service provisioning-interface.service wait-iptables-init.service
+Wants=network-online.target
+After=network-online.target ironic-volume.service build-ironic-env.service provisioning-interface.service
 
 [Container]
 ContainerName=dnsmasq

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

@@ -1,10 +1,10 @@
 [Unit]
 Description=HTTP Server for Ironic
 BindsTo=ironic-volume.service
-Requires=build-ironic-env.service wait-iptables-init.service
+Requires=build-ironic-env.service
 PartOf=ironic.service
 Wants=network-online.target
-After=network-online.target ironic-volume.service build-ironic-env.service extract-machine-os.service provisioning-interface.service wait-iptables-init.service
+After=network-online.target ironic-volume.service build-ironic-env.service extract-machine-os.service provisioning-interface.service
 
 [Container]
 ContainerName=httpd

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

@@ -1,15 +1,15 @@
 [Unit]
 Description=Ironic baremetal deployment service
 BindsTo=ironic-volume.service
-Requires=build-ironic-env.service wait-iptables-init.service image-customization.service
+Requires=build-ironic-env.service
 {{ if .PlatformData.BareMetal.ProvisioningIP }}
 Requires=provisioning-interface.service
 {{ end }}
 {{ if .PlatformData.BareMetal.ProvisioningDNSMasq }}
 Wants=ironic-dnsmasq.service
 {{ end }}
-Wants=network-online.target ironic-httpd.service ironic-ramdisk-logs.service
-After=network-online.target ironic-volume.service build-ironic-env.service wait-iptables-init.service provisioning-interface.service ironic-dnsmasq.service image-customization.service
+Wants=network-online.target ironic-httpd.service ironic-ramdisk-logs.service extract-machine-os.service
+After=network-online.target ironic-volume.service build-ironic-env.service provisioning-interface.service ironic-dnsmasq.service extract-machine-os.service
 
 [Container]
 ContainerName=ironic

data/data/bootstrap/baremetal/files/etc/containers/systemd/metal3-baremetal-operator.container

@@ -1,9 +1,8 @@
 [Unit]
 Description=Metal3 deployment service
-BindsTo=ironic-volume.service
-Requires=build-metal3-env.service wait-iptables-init.service image-customization.service build-ironic-env.service
-Wants=network-online.target ironic-httpd.service ironic-ramdisk-logs.service
-After=network-online.target ironic-volume.service build-ironic-env.service image-customization.service build-metal3-env.service
+Requires=build-metal3-env.service ironic.service
+Wants=network-online.target image-customization.service
+After=network-online.target build-metal3-env.service
 
 [Container]
 ContainerName=baremetal-operator
@@ -16,8 +15,6 @@ Volume=/opt/openshift/tls/ironic/:/certs/ironic/:z
 Environment="XDG_RUNTIME_DIR=/run/user/${UID}"
 Environment="KUBECONFIG=/opt/openshift/auth/kubeconfig-loopback"
 Environment="DEPLOY_KERNEL_URL=file:///shared/html/images/ironic-python-agent.kernel"
-Environment="IRONIC_KERNEL_PARAMS=${IRONIC_KERNEL_PARAMS}"
-Environment="HTTP_PORT=${HTTP_PORT}"
 Environment="IRONIC_ENDPOINT=${IRONIC_ENDPOINT}"
 Environment="IRONIC_EXTERNAL_URL_V6=${IRONIC_EXTERNAL_URL_V6}"
 Environment="LEASE_DURATION_SECONDS=137"