diff options
| author |   shuai chen <chenshuai@huawei.com> | 2016-08-30 06:15:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-30 06:15:41 +0000 |
| commit | e895f1fa7fd3f7f8a3152376bc30cbdd51028566 (patch) | |
| tree | fa1fdb3105c516308c86f9a277a20c2a7f2ebb65 /deploy/adapters/ansible/openstack_mitaka | |
| parent | 1b8e4ce12d749141581ca880a13a71314acbbf79 (diff) | |
| parent | 8e21cb6530e6e55d8a080887dfbf93f0d07edeb1 (diff) | |
Merge "Add heat user domain configuration"
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka')
| -rw-r--r-- | deploy/adapters/ansible/openstack_mitaka/roles/keystone/templates/admin-openrc-v3.sh | 19 | ||||
| -rw-r--r-- | deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/Debian.yml | 21 |
2 files changed, 0 insertions, 40 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/keystone/templates/admin-openrc-v3.sh b/deploy/adapters/ansible/openstack_mitaka/roles/keystone/templates/admin-openrc-v3.sh deleted file mode 100644 index c3d863e8..00000000 --- a/deploy/adapters/ansible/openstack_mitaka/roles/keystone/templates/admin-openrc-v3.sh +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################## -# 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/v3 -export OS_IDENTITY_API_VERSION=3 -export OS_USERNAME=admin -export OS_VOLUME_API_VERSION=2 -export OS_USER_DOMAIN_NAME=Default -export OS_PROJECT_DOMAIN_NAME=Default - - diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/Debian.yml b/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/Debian.yml deleted file mode 100644 index b8d8e7c2..00000000 --- a/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/Debian.yml +++ /dev/null @@ -1,21 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- - -cron_path: "/var/spool/cron/crontabs" - -packages: - - keystone - - python-openstackclient - -services: - - apache2 - -apache_config_dir: /etc/apache2 -http_service_name: apache2 |