openstack/devstack
Code Issues Proposed changes

Merge "openrc: Stop setting OS_TENANT_NAME"

Browse Source
This commit is contained in:
Zuul 2024-06-20 09:59:22 +00:00 committed by Gerrit Code Review
commit 5f35bfd2a7
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openrc
View File

@ -7,9 +7,6 @@
# Set OS_USERNAME to override the default user name 'demo' # Set OS_USERNAME to override the default user name 'demo'
# Set ADMIN_PASSWORD to set the password for 'admin' and 'demo' # Set ADMIN_PASSWORD to set the password for 'admin' and 'demo'
# NOTE: support for the old NOVA_* novaclient environment variables has
# been removed.
if [[ -n "$1" ]]; then if [[ -n "$1" ]]; then
OS_USERNAME=$1 OS_USERNAME=$1
fi fi
@ -36,22 +33,14 @@ fi
source $RC_DIR/lib/tls source $RC_DIR/lib/tls
# The OpenStack ecosystem has standardized the term **project** as the # The OpenStack ecosystem has standardized the term **project** as the
# entity that owns resources. In some places **tenant** remains # entity that owns resources.
# referenced, but in all cases this just means **project**. We will
# warn if we need to turn on legacy **tenant** support to have a
# working environment.
export OS_PROJECT_NAME=${OS_PROJECT_NAME:-demo} export OS_PROJECT_NAME=${OS_PROJECT_NAME:-demo}
echo "WARNING: setting legacy OS_TENANT_NAME to support cli tools."
export OS_TENANT_NAME=$OS_PROJECT_NAME
# In addition to the owning entity (project), nova stores the entity performing # In addition to the owning entity (project), nova stores the entity performing
# the action as the **user**. # the action as the **user**.
export OS_USERNAME=${OS_USERNAME:-demo} export OS_USERNAME=${OS_USERNAME:-demo}
# With Keystone you pass the keystone password instead of an api key. # With Keystone you pass the keystone password instead of an api key.
# Recent versions of novaclient use OS_PASSWORD instead of NOVA_API_KEYs
# or NOVA_PASSWORD.
export OS_PASSWORD=${ADMIN_PASSWORD:-secret} export OS_PASSWORD=${ADMIN_PASSWORD:-secret}
# Region # Region