Revert "Enable keystone token caching by OSC"
This reverts commit 67630d4c52aef5ddcb15cff4f3b6594d447e8992.
Reason for revert: Seeing random failures across jobs as sometimes
'keyring_pass.cfg' gets duplicated keys and that makes executions
of any openstackclient command to fail until the file is removed.
This should be handled before re enabling the token caching again.
Change-Id: I3d2fe53a2e7552ac6304c30aa2fe5be33d77df53
Related-Bug: #2042943
diff --git a/functions-common b/functions-common
index 03d7c96..c57c4cc 100644
--- a/functions-common
+++ b/functions-common
@@ -1047,8 +1047,6 @@
--description="$3" \
-f value -c id
)
- # Drop cached token to invalidate catalog info in the token
- remove_token_cache
echo $service_id
}
@@ -1066,6 +1064,7 @@
endpoint_id=$(openstack --os-cloud devstack-system-admin endpoint create \
$1 $2 $3 --region $4 -f value -c id)
fi
+
echo $endpoint_id
}
@@ -1089,8 +1088,6 @@
if [[ -n "$5" ]]; then
_get_or_create_endpoint_with_interface $1 internal $5 $2
fi
- # Drop cached token to invalidate catalog info in the token
- remove_token_cache
# return the public id to indicate success, and this is the endpoint most likely wanted
echo $public_id
}
@@ -2520,11 +2517,6 @@
[ "$fips" == "1" ]
}
-function remove_token_cache {
- # Remove Keyring cache file
- rm ~/.local/share/python_keyring/keyring_pass.cfg
-}
-
# Restore xtrace
$_XTRACE_FUNCTIONS_COMMON