baremetal bootstrap: Downgrade Requires dependencies to Wants

Since the image customization service now runs as a kubernetes
controller, it is no longer directly required by ironic (as it was when
it ran on static data and Terraform was doing the provisioning). Ironic
needs only the kernel to be set up by extract-machine-os, which was
previously a transitive dependency.

And although it is wanted by BMO, it should not block BMO startup as BMO
may be able to at least provide some useful debugging information in the
CRDs if the image-customization service is not running.

In turn, the image-customization controller can run and potentially
provide useful error messages if the CoreOS ISO file does not exist, so
use Wants instead of Requires to depend on extract-machine-os.

Author: zaneb

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.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 wait-iptables-init.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 wait-iptables-init.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,8 +1,8 @@
 [Unit]
 Description=Metal3 deployment service
-Requires=build-metal3-env.service image-customization.service ironic.service
-Wants=network-online.target
-After=network-online.target 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