Browse code
Check NOVA_USERNAME instead of USERNAME in openrc.
Normally, NOVA_USERNAME should be set to demo, but in some cases
it was being set to the running user ("stack") because it was
checking USERNAME as a possible default value.
This aligns with the pattern currently in master (for OS_USERNAME)
in that it uses either the value of NOVA_USERNAME or "demo".
This problem was identified by John Tran.
Change-Id: I82c005bbab9640642846793d25d36b776c8c897e
James E. Blair authored on 2012/08/07 06:11:47Showing 1 changed files
| ... | ... |
@@ -16,7 +16,7 @@ export NOVA_PROJECT_ID=${TENANT:-demo}
|
| 16 | 16 |
|
| 17 | 17 |
# In addition to the owning entity (tenant), nova stores the entity performing |
| 18 | 18 |
# the action as the **user**. |
| 19 |
-export NOVA_USERNAME=${USERNAME:-demo}
|
|
| 19 |
+export NOVA_USERNAME=${NOVA_USERNAME:-demo}
|
|
| 20 | 20 |
|
| 21 | 21 |
# With Keystone you pass the keystone password instead of an api key. |
| 22 | 22 |
# The most recent versions of novaclient use NOVA_PASSWORD instead of NOVA_API_KEY |
| ... | ... |
@@ -43,7 +43,7 @@ export NOVA_REGION_NAME=${NOVA_REGION_NAME:-RegionOne}
|
| 43 | 43 |
export EC2_URL=${EC2_URL:-http://$SERVICE_HOST:8773/services/Cloud}
|
| 44 | 44 |
|
| 45 | 45 |
# Access key is set in the initial keystone data to be the same as username |
| 46 |
-export EC2_ACCESS_KEY=${USERNAME:-demo}
|
|
| 46 |
+export EC2_ACCESS_KEY=${NOVA_USERNAME:-demo}
|
|
| 47 | 47 |
|
| 48 | 48 |
# Secret key is set in the initial keystone data to the admin password |
| 49 | 49 |
export EC2_SECRET_KEY=${ADMIN_PASSWORD:-secrete}
|