openstack/ironic
Code Issues Proposed changes

Make curl in DevStack Bypass Proxy

Browse Source 
This commit modifies curl option in wait_for_nova_resources to
bypass proxy with --noproxy option. Without this option, if you run
DevStack behind proxy, curl command fails with timeout &
wait_for_nova_resources also fails.
Because curl only accesses Placement service API, this modification
should be fair.

Change-Id: I5524a76594bb784f59be4d4e3970f72d4497891b
This commit is contained in:
Vanou Ishii 2021-08-11 14:58:58 +09:00
parent b77a76dd63
commit 1c3e20d859
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/lib/ironic
View File

@ -2202,7 +2202,7 @@ function wait_for_nova_resources {
for i in $(seq 1 12); do for i in $(seq 1 12); do
# Fetch provider UUIDs from Placement # Fetch provider UUIDs from Placement
local providers local providers
providers=$(curl -sH "X-Auth-Token: $token" $endpoint/resource_providers \ providers=$(curl --noproxy '*' -sH "X-Auth-Token: $token" $endpoint/resource_providers \
| jq -r '.resource_providers[].uuid') | jq -r '.resource_providers[].uuid')
local p local p
@ -2213,13 +2213,13 @@ function wait_for_nova_resources {
# A resource class inventory record looks something like # A resource class inventory record looks something like
# {"max_unit": 1, "min_unit": 1, "step_size": 1, "reserved": 0, "total": 1, "allocation_ratio": 1} # {"max_unit": 1, "min_unit": 1, "step_size": 1, "reserved": 0, "total": 1, "allocation_ratio": 1}
# Subtrack reserved from total (defaulting both to 0) # Subtrack reserved from total (defaulting both to 0)
amount=$(curl -sH "X-Auth-Token: $token" $endpoint/resource_providers/$p/inventories \ amount=$(curl --noproxy '*' -sH "X-Auth-Token: $token" $endpoint/resource_providers/$p/inventories \
| jq ".inventories.CUSTOM_$resource_class as \$cls | jq ".inventories.CUSTOM_$resource_class as \$cls
| (\$cls.total // 0) - (\$cls.reserved // 0)") | (\$cls.total // 0) - (\$cls.reserved // 0)")
# Check whether the resource provider has all expected traits # Check whether the resource provider has all expected traits
# registered against it. # registered against it.
rp_traits=$(curl -sH "X-Auth-Token: $token" \ rp_traits=$(curl --noproxy '*' -sH "X-Auth-Token: $token" \
-H "OpenStack-API-Version: placement 1.6" \ -H "OpenStack-API-Version: placement 1.6" \
$endpoint/resource_providers/$p/traits) $endpoint/resource_providers/$p/traits)
for trait in $IRONIC_DEFAULT_TRAITS; do for trait in $IRONIC_DEFAULT_TRAITS; do