diff options
author | liyuenan <liyuenan@huawei.com> | 2016-12-19 11:06:36 +0800 |
---|---|---|
committer | liyuenan <liyuenan@huawei.com> | 2016-12-20 15:05:03 +0800 |
commit | 819912d0379f6cd2b2693c2968576f7514a117c5 (patch) | |
tree | e24d274484fa1ec8976c9f1bd44f5ee6e445724b /deploy/adapters/ansible/roles/keystone/templates/admin-openrc.sh | |
parent | eb5dbdac42b1b7b775fbc1dc513376425a6898ff (diff) |
master only support newton
JIRA: COMPASS-513
Remove other roles and ppa, master only support newton.
Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/keystone/templates/admin-openrc.sh')
-rw-r--r-- | deploy/adapters/ansible/roles/keystone/templates/admin-openrc.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/deploy/adapters/ansible/roles/keystone/templates/admin-openrc.sh b/deploy/adapters/ansible/roles/keystone/templates/admin-openrc.sh index 6ba620ff..94d5850f 100644 --- a/deploy/adapters/ansible/roles/keystone/templates/admin-openrc.sh +++ b/deploy/adapters/ansible/roles/keystone/templates/admin-openrc.sh @@ -7,9 +7,12 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## # Verify the Identity Service installation -export OS_PASSWORD={{ ADMIN_PASS }} +export OS_PROJECT_DOMAIN_NAME=default +export OS_USER_DOMAIN_NAME=default export OS_TENANT_NAME=admin -export OS_AUTH_URL=http://{{ internal_vip.ip }}:35357/v2.0 +export OS_PROJECT_NAME=admin export OS_USERNAME=admin -export OS_VOLUME_API_VERSION=2 - +export OS_PASSWORD={{ ADMIN_PASS }} +export OS_AUTH_URL=http://{{ internal_vip.ip }}:35357/v3 +export OS_IDENTITY_API_VERSION=3 +export OS_IMAGE_API_VERSION=2 |