Skip to content

Commit e4a744c

Browse files
committed
Remove copy-pasta from metal3-baremetal-operator service
Some of the configuration in this file has been inherited from the ironic service. We don't mount ironic.volume, so there is no need to depend on it. We don't include the /etc/ironic.env environment file, so we do not need to wait for it to be built and should not attempt to pass on the HTTP_PORT and IRONIC_KERNEL_PARAMS environment variables from it. Finally, BMO requires the ironic.service, so set that dependency instead of using ironic.service's own dependencies. Note that this must be a Requires dependency because we need the BMO to stop when we stop ironic.service in master-bmh-update.
1 parent 0d6deaf commit e4a744c

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
[Unit]
22
Description=Metal3 deployment service
3-
BindsTo=ironic-volume.service
4-
Requires=build-metal3-env.service wait-iptables-init.service image-customization.service build-ironic-env.service
5-
Wants=network-online.target ironic-httpd.service ironic-ramdisk-logs.service
6-
After=network-online.target ironic-volume.service build-ironic-env.service image-customization.service build-metal3-env.service
3+
Requires=build-metal3-env.service image-customization.service ironic.service
4+
Wants=network-online.target
5+
After=network-online.target image-customization.service build-metal3-env.service
76

87
[Container]
98
ContainerName=baremetal-operator
@@ -15,8 +14,6 @@ Volume=/opt/openshift:/opt/openshift:z,ro
1514
Environment="XDG_RUNTIME_DIR=/run/user/${UID}"
1615
Environment="KUBECONFIG=/opt/openshift/auth/kubeconfig-loopback"
1716
Environment="DEPLOY_KERNEL_URL=file:///shared/html/images/ironic-python-agent.kernel"
18-
Environment="IRONIC_KERNEL_PARAMS=${IRONIC_KERNEL_PARAMS}"
19-
Environment="HTTP_PORT=${HTTP_PORT}"
2017
Environment="IRONIC_ENDPOINT=${IRONIC_ENDPOINT}"
2118
Environment="IRONIC_EXTERNAL_URL_V6=${IRONIC_EXTERNAL_URL_V6}"
2219
Environment="LEASE_DURATION_SECONDS=137"

0 commit comments

Comments
 (0)