diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2018-02-28 15:52:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-28 15:52:57 +0000 |
| commit | e670c9c6e165ee508bd509a3cd71f80c45d6d919 (patch) | |
| tree | 63b35a615f362f5247954ac863cbd1a15983c610 /ansible/roles/create_storperf_admin_rc/templates/storperf_admin-rc.j2 | |
| parent | 3387e5618de37c37714c86cec9058d737cb01a5c (diff) | |
| parent | 6750645d2e6a687b9f9d064b3e333e880f17b3e8 (diff) | |
Merge "Deprecate authentication variable OS_TENANT_NAME"
Diffstat (limited to 'ansible/roles/create_storperf_admin_rc/templates/storperf_admin-rc.j2')
| -rw-r--r-- | ansible/roles/create_storperf_admin_rc/templates/storperf_admin-rc.j2 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ansible/roles/create_storperf_admin_rc/templates/storperf_admin-rc.j2 b/ansible/roles/create_storperf_admin_rc/templates/storperf_admin-rc.j2 index 410ab24df..888e87118 100644 --- a/ansible/roles/create_storperf_admin_rc/templates/storperf_admin-rc.j2 +++ b/ansible/roles/create_storperf_admin_rc/templates/storperf_admin-rc.j2 @@ -1,7 +1,5 @@ OS_AUTH_URL="{{ openrc.OS_AUTH_URL }}" OS_USERNAME="{{ openrc.OS_USERNAME|default('admin') }}" OS_PASSWORD="{{ openrc.OS_PASSWORD|default('console') }}" -OS_TENANT_NAME="{{ openrc.OS_TENANT_NAME|default('admin') }}" OS_VOLUME_API_VERSION="{{ openrc.OS_VOLUME_API_VERSION|default('2') }}" -OS_PROJECT_NAME="{{ openrc.OS_PROJECT_NAME|default(openrc.OS_TENANT_NAME) }}" -OS_TENANT_ID="{{ os_tenant_id }}" +OS_PROJECT_NAME="{{ openrc.OS_PROJECT_NAME|openrc.OS_TENANT_NAME|default('admin') }}" |