Skip to content

Bug 2045927: Add proxy for ironic-agent.service #5569

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

Merged
openshift-merge-robot merged 1 commit into from
Jan 27, 2022
Merged

Bug 2045927: Add proxy for ironic-agent.service #5569

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
15 changes: 15 additions & 0 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 @@ -184,6 +184,18 @@ else
IRONIC_HOST="${IRONIC_IP}"
fi

{{if .Proxy -}}
{{if .Proxy.HTTPProxy -}}
HTTP_PROXY="{{.Proxy.HTTPProxy}}"
{{end -}}
{{if .Proxy.HTTPSProxy -}}
HTTPS_PROXY="{{.Proxy.HTTPSProxy}}"
{{end -}}
{{if .Proxy.NoProxy -}}
NO_PROXY="{{.Proxy.NoProxy}}"
{{end -}}
{{end -}}

# Create a podman secret for the image-customization-server
podman secret rm pull-secret || true
base64 -w 0 /root/.docker/config.json | podman secret create pull-secret -
Expand All @@ -197,6 +209,9 @@ podman run -d --net host --privileged --name image-customization \
--env IRONIC_AGENT_IMAGE="$IRONIC_AGENT_IMAGE" \
--env IP_OPTIONS=$EXTERNAL_IP_OPTIONS \
--env REGISTRIES_CONF_PATH=/tmp/containers/registries.conf \
--env HTTP_PROXY="$HTTP_PROXY" \
--env HTTPS_PROXY="$HTTPS_PROXY" \
--env NO_PROXY="$NO_PROXY" \
--entrypoint '["/image-customization-server", "--nmstate-dir=/tmp/nmstate/", "--images-publish-addr=http://0.0.0.0:8084"]' \
-v /tmp/nmstate/:/tmp/nmstate/ \
-v $IRONIC_SHARED_VOLUME:/shared:z \
Expand Down