Skip to content

Commit 608489c

Browse files
committed
openrc: Stop setting OS_TENANT_NAME
All clients - OSC included - use keystoneauth under the hood which hasn't required this in a very long time. Stop setting it and remove the warning. We also remove references to 'NOVA_*' variables that haven't been a thing since well before *I* started working on OpenStack 😅 Change-Id: I882081040215d8e32932ec5d03be34e467e4fbc2 Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
1 parent 92d70a8 commit 608489c

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

openrc

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
# Set OS_USERNAME to override the default user name 'demo'
88
# Set ADMIN_PASSWORD to set the password for 'admin' and 'demo'
99

10-
# NOTE: support for the old NOVA_* novaclient environment variables has
11-
# been removed.
12-
1310
if [[ -n "$1" ]]; then
1411
OS_USERNAME=$1
1512
fi
@@ -36,22 +33,14 @@ fi
3633
source $RC_DIR/lib/tls
3734

3835
# The OpenStack ecosystem has standardized the term **project** as the
39-
# entity that owns resources. In some places **tenant** remains
40-
# referenced, but in all cases this just means **project**. We will
41-
# warn if we need to turn on legacy **tenant** support to have a
42-
# working environment.
36+
# entity that owns resources.
4337
export OS_PROJECT_NAME=${OS_PROJECT_NAME:-demo}
4438

45-
echo "WARNING: setting legacy OS_TENANT_NAME to support cli tools."
46-
export OS_TENANT_NAME=$OS_PROJECT_NAME
47-
4839
# In addition to the owning entity (project), nova stores the entity performing
4940
# the action as the **user**.
5041
export OS_USERNAME=${OS_USERNAME:-demo}
5142

5243
# With Keystone you pass the keystone password instead of an api key.
53-
# Recent versions of novaclient use OS_PASSWORD instead of NOVA_API_KEYs
54-
# or NOVA_PASSWORD.
5544
export OS_PASSWORD=${ADMIN_PASSWORD:-secret}
5645

5746
# Region

0 commit comments

Comments
 (0)