Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 2004600: Remove duplicate ramdisk log container #5219

Merged
merged 1 commit into from
Sep 16, 2021
Merged

Bug 2004600: Remove duplicate ramdisk log container #5219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions data/data/bootstrap/baremetal/files/usr/local/bin/startironic.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ IRONIC_RAMDISK_SSH_KEY="{{.SSHKey}}"

# First we stop any previously started containers, because ExecStop only runs when the ExecStart process
# e.g this script is still running, but we exit if *any* of the containers exits unexpectedly
for name in ironic-api ironic-conductor ironic-inspector ironic-deploy-ramdisk-logs ironic-inspector-ramdisk-logs dnsmasq httpd mariadb ipa-downloader coreos-downloader; do
for name in ironic-api ironic-conductor ironic-inspector ironic-ramdisk-logs dnsmasq httpd mariadb ipa-downloader coreos-downloader; do
podman ps | grep -w "$name$" && podman kill $name
podman ps --all | grep -w "$name$" && podman rm $name -f
done
Expand Down Expand Up @@ -189,16 +189,11 @@ sudo podman run -d --net host --privileged --name ironic-api \
-v $AUTH_DIR:/auth:ro \
-v $IRONIC_SHARED_VOLUME:/shared:z ${IRONIC_IMAGE}

sudo podman run -d --name ironic-deploy-ramdisk-logs \
sudo podman run -d --name ironic-ramdisk-logs \
--restart on-failure \
--entrypoint /bin/runlogwatch.sh \
-v $IRONIC_SHARED_VOLUME:/shared:z ${IRONIC_IMAGE}

podman run -d --name ironic-inspector-ramdisk-logs \
--restart on-failure \
--entrypoint /bin/runlogwatch.sh \
-v $IRONIC_SHARED_VOLUME:/shared:z "${IRONIC_IMAGE}"

set +x
AUTH_DIR=/opt/metal3/auth
ironic_url="$(printf 'http://%s:%s@localhost:6385/v1' "$(cat "${AUTH_DIR}/ironic/username")" "$(cat "${AUTH_DIR}/ironic/password")")"
Expand All @@ -221,7 +216,7 @@ while true; do
done

echo "Stopping provisioning services..."
podman stop ironic-api ironic-conductor ironic-inspector ironic-deploy-ramdisk-logs ironic-inspector-ramdisk-logs $dnsmasq_container_name httpd mariadb
podman stop ironic-api ironic-conductor ironic-inspector ironic-ramdisk-logs $dnsmasq_container_name httpd mariadb
exit 0
fi

Expand Down