Skip to content

Commit

Permalink
baremetal: Specify entrypoint when starting inspector
Browse files Browse the repository at this point in the history
Since openshift/ironic-image#190 the inspector components
and entrypoint moved to the ironic-image, so we need to
update the image and entrypoint to match, also aligning
with openshift/cluster-baremetal-operator#132
  • Loading branch information
derekhiggins committed Sep 13, 2021
1 parent 0829e42 commit 5309d88
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ set -ex
. /usr/local/bin/release-image.sh

IRONIC_IMAGE=$(image_for ironic)
IRONIC_INSPECTOR_IMAGE=$(image_for ironic-inspector)
IPA_DOWNLOADER_IMAGE=$(image_for ironic-ipa-downloader)
COREOS_DOWNLOADER_IMAGE=$(image_for ironic-machine-os-downloader || image_for ironic-rhcos-downloader)

Expand Down Expand Up @@ -177,8 +176,9 @@ podman run -d --net host --privileged --name ironic-inspector \
--restart on-failure \
--env PROVISIONING_INTERFACE=$PROVISIONING_NIC \
--env HTTP_BASIC_HTPASSWD=${IRONIC_HTPASSWD} \
--entrypoint /bin/runironic-inspector \
-v $AUTH_DIR:/auth:ro \
-v $IRONIC_SHARED_VOLUME:/shared:z "${IRONIC_INSPECTOR_IMAGE}"
-v $IRONIC_SHARED_VOLUME:/shared:z "${IRONIC_IMAGE}"

sudo podman run -d --net host --privileged --name ironic-api \
--restart on-failure \
Expand All @@ -197,7 +197,7 @@ sudo podman run -d --name ironic-deploy-ramdisk-logs \
podman run -d --name ironic-inspector-ramdisk-logs \
--restart on-failure \
--entrypoint /bin/runlogwatch.sh \
-v $IRONIC_SHARED_VOLUME:/shared:z "${IRONIC_INSPECTOR_IMAGE}"
-v $IRONIC_SHARED_VOLUME:/shared:z "${IRONIC_IMAGE}"

set +x
AUTH_DIR=/opt/metal3/auth
Expand Down

0 comments on commit 5309d88

Please sign in to comment.