From 70fbbfd90010770539a868cb39776bd22752abb0 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 2 Feb 2022 11:09:31 -0500 Subject: [PATCH 1/2] baremetal: remove redundant proxy setting --- .../files/usr/local/bin/startironic.sh.template | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/data/data/bootstrap/baremetal/files/usr/local/bin/startironic.sh.template b/data/data/bootstrap/baremetal/files/usr/local/bin/startironic.sh.template index 24285c11c6f..81557bcb915 100755 --- a/data/data/bootstrap/baremetal/files/usr/local/bin/startironic.sh.template +++ b/data/data/bootstrap/baremetal/files/usr/local/bin/startironic.sh.template @@ -184,18 +184,6 @@ 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 - From 8cbb6d8df8e102764aa672072ca190a75c2bb8fe Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Mon, 7 Feb 2022 05:44:17 -0500 Subject: [PATCH 2/2] Proxy environment variable should be already passed by default by podman in the container --- .../baremetal/files/usr/local/bin/startironic.sh.template | 3 --- 1 file changed, 3 deletions(-) diff --git a/data/data/bootstrap/baremetal/files/usr/local/bin/startironic.sh.template b/data/data/bootstrap/baremetal/files/usr/local/bin/startironic.sh.template index 81557bcb915..de16af7bd67 100755 --- a/data/data/bootstrap/baremetal/files/usr/local/bin/startironic.sh.template +++ b/data/data/bootstrap/baremetal/files/usr/local/bin/startironic.sh.template @@ -197,9 +197,6 @@ 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 \