From 8e21cb6530e6e55d8a080887dfbf93f0d07edeb1 Mon Sep 17 00:00:00 2001 From: QiLiang Date: Mon, 29 Aug 2016 14:01:23 +0800 Subject: Add heat user domain configuration FIX Rally heat create_update_delete_stack test case failure for Liberty Ubuntu JIRA: COMPASS-454 Change-Id: Id4538f9caa5b619d66ab8fe97c63b10688ffe104 Signed-off-by: QiLiang --- .../roles/keystone/templates/admin-openrc-v3.sh | 19 ------------------- .../openstack_mitaka/roles/keystone/vars/Debian.yml | 21 --------------------- 2 files changed, 40 deletions(-) delete mode 100644 deploy/adapters/ansible/openstack_mitaka/roles/keystone/templates/admin-openrc-v3.sh delete mode 100644 deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/Debian.yml (limited to 'deploy/adapters/ansible/openstack_mitaka') 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 -- cgit 1.2.3-korg