[DNM] CI: Fix breakage following devstack changes

A recent devstack change [1] has dropped all KEYSTONE_AUTH_* variables
except KEYSTONE_AUTH_URI. Use KEYSTONE_SERVICE_* variables instead.

Another change [2] switched off the creation of an admin endpoint for
keystone, which we need. Get or create it again until we update Fenix
to stop using it.

Update service name/type and endpoint URLs accordingly.

[1] https://review.opendev.org/c/openstack/devstack/+/735472
[2] https://review.opendev.org/c/openstack/devstack/+/777345

Change-Id: I3c876344b4d29d3de536910f2997a57ab1d2d320
This commit is contained in:
Ayumu Ueha 2021-11-08 09:41:13 +00:00
parent bd0810495f
commit ab5ff8f3ab
5 changed files with 40 additions and 38 deletions

View File

@ -67,13 +67,16 @@ function create_fenix_accounts {
"$REGION_NAME" \
"$fenix_api_url/v1"
KEYSTONEV3_SERVICE=$(get_or_create_service "keystonev3" \
"identityv3" "Keystone Identity Service V3")
get_or_create_endpoint $KEYSTONEV3_SERVICE \
# Create admin and internal endpoints for keystone. Fenix currently uses
# the admin endpoint to interact with keystone, but devstack stopped
# creating one in https://review.opendev.org/c/openstack/devstack/+/777345
KEYSTONE_SERVICE=$(get_or_create_service "keystone" \
"identity" "Keystone Identity Service")
get_or_create_endpoint $KEYSTONE_SERVICE \
"$REGION_NAME" \
"$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v3" \
"$KEYSTONE_AUTH_PROTOCOL://$KEYSTONE_AUTH_HOST:$KEYSTONE_AUTH_PORT/v3" \
"$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v3"
"${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}/identity" \
"${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}/identity" \
"${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}/identity"
}
function start_fenix {

View File

@ -3,7 +3,6 @@
# process, which may cause wedges in the gate later.
# These are needed for docs generation
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.2,!=2.1.0;python_version>='3.4' # BSD
openstackdocstheme>=1.18.1 # Apache-2.0
os-api-ref>=1.6.0 # Apache-2.0

View File

@ -1,23 +1,23 @@
coverage==4.0 # Apache-2.0
coverage==6.1.1 # Apache-2.0
hacking==2.0 # Apache-2.0
openstackdocstheme==1.31.2 # Apache-2.0
oslotest==3.8.0 # Apache-2.0
pbr==2.0 # Apache-2.0
python-subunit==1.3.0 # Apache-2.0/BSD
oslotest==4.5.0 # Apache-2.0
pbr==5.7.0 # Apache-2.0
python-subunit==1.4.0 # Apache-2.0/BSD
reno==3.0.0;python_version=='3.6'
reno==3.0.0;python_version=='3.7'
sphinx==2.3.1;python_version=='3.6'
sphinx==2.3.1;python_version=='3.7'
stestr==1.0.0 # Apache-2.0
testtools==2.2.0 # MIT
ddt==1.0.1 # MIT
mock==2.0.0 # BSD
stestr==3.2.1 # Apache-2.0
testtools==2.5.0 # MIT
ddt==1.4.4 # MIT
mock==4.0.3 # BSD
fixtures==3.0.0 # Apache-2.0/BSD
testrepository==0.0.18 # Apache-2.0/BSD
testscenarios==0.4 # Apache-2.0/BSD
oslo.context==2.23 # Apache-2.0
oslo.config==4.46 # Apache-2.0
oslo.log==3.43 # Apache-2.0
oslo.db==4.46 # Apache-2.0
oslo.policy==2.2.0 # Apache-2.0
oslo.messaging==9.6.0 # Apache-2.0
testrepository==0.0.20 # Apache-2.0/BSD
testscenarios==0.5.0 # Apache-2.0/BSD
oslo.context==3.4.0 # Apache-2.0
oslo.config==8.7.1 # Apache-2.0
oslo.log==4.6.1 # Apache-2.0
oslo.db==11.0.0 # Apache-2.0
oslo.policy==3.9.0 # Apache-2.0
oslo.messaging==12.11.0 # Apache-2.0

View File

@ -2,4 +2,4 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pbr!=2.1.0,>=2.0 # Apache-2.0
pbr>=5.7.0 # Apache-2.0

View File

@ -3,19 +3,19 @@
# process, which may cause wedges in the gate later.
hacking>=2.0,<2.1 # Apache-2.0
coverage>=4.0,!=4.4 # Apache-2.0
python-subunit>=1.3.0 # Apache-2.0/BSD
oslotest>=3.8.0 # Apache-2.0
stestr>=1.0.0 # Apache-2.0
testtools>=2.2.0 # MIT
coverage>=6.1.1 # Apache-2.0
python-subunit>=1.4.0 # Apache-2.0/BSD
oslotest>=4.5.0 # Apache-2.0
stestr>=3.2.1 # Apache-2.0
testtools>=2.5.0 # MIT
ddt>=1.0.1 # MIT
mock>=2.0.0 # BSD
mock>=4.0.3 # BSD
fixtures>=3.0.0 # Apache-2.0/BSD
testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD
oslo.context>=2.23 # Apache-2.0
oslo.config>=4.46 # Apache-2.0
oslo.log>=3.43 # Apache-2.0
oslo.db>=4.46 # Apache-2.0
oslo.policy!=3.0.0,>=2.2.0 # Apache-2.0
oslo.messaging>=9.6.0 # Apache-2.0
testrepository>=0.0.20 # Apache-2.0/BSD
testscenarios>=0.5.0 # Apache-2.0/BSD
oslo.context>=3.4.0 # Apache-2.0
oslo.config>=8.7.1 # Apache-2.0
oslo.log>=4.6.1 # Apache-2.0
oslo.db>=11.0.0 # Apache-2.0
oslo.policy>=3.9.0 # Apache-2.0
oslo.messaging>=12.11.0 # Apache-2.0