From 808d01a0cbe53cb255b528dd0d04f42ef7a23e1a Mon Sep 17 00:00:00 2001 From: liyuenan Date: Thu, 10 Nov 2016 10:25:03 +0800 Subject: Support API v2.0 JIRA: COMPASS-491 Change-Id: I56c854d752d0dbf72ec3984670b49606c044bec1 Signed-off-by: liyuenan --- .../roles/keystone/tasks/keystone_install.yml | 1 + .../roles/keystone/templates/admin-openrc-v2.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/templates/admin-openrc-v2.sh diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/tasks/keystone_install.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/tasks/keystone_install.yml index e9a36d42..757349c5 100644 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/tasks/keystone_install.yml +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/tasks/keystone_install.yml @@ -92,6 +92,7 @@ template: src={{ item }} dest=/opt/{{ item }} with_items: - admin-openrc.sh + - admin-openrc-v2.sh - demo-openrc.sh - meta: flush_handlers diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/templates/admin-openrc-v2.sh b/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/templates/admin-openrc-v2.sh new file mode 100644 index 00000000..6ba620ff --- /dev/null +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/templates/admin-openrc-v2.sh @@ -0,0 +1,15 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +# Verify the Identity Service installation +export OS_PASSWORD={{ ADMIN_PASS }} +export OS_TENANT_NAME=admin +export OS_AUTH_URL=http://{{ internal_vip.ip }}:35357/v2.0 +export OS_USERNAME=admin +export OS_VOLUME_API_VERSION=2 + -- cgit 1.2.3-korg