diff options
author | liyuenan <liyuenan@huawei.com> | 2017-01-14 11:16:38 +0800 |
---|---|---|
committer | liyuenan <liyuenan@huawei.com> | 2017-01-14 11:19:47 +0800 |
commit | 1da2cee07a11d5dd7b83ab0437807fc239929f1c (patch) | |
tree | a7fd1c261124bfdecbd97b6810a7aedf6f92568a /deploy/adapters | |
parent | 2a50e36dfa46b9353840170665fb8a891b18228d (diff) |
Remove some duplicate or useless files
JIRA: -
Remove some templates because it is duplicated.
Remove some repo files because master support newton only.
Change-Id: I6651191c6edb2ef6ab5da109922a889a8cd58a78
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/adapters')
4 files changed, 0 insertions, 66 deletions
diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2 b/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2 deleted file mode 100644 index d0cadeaa..00000000 --- a/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2 +++ /dev/null @@ -1,37 +0,0 @@ -[DEFAULT] -rpc_backend = rabbit -auth_strategy = keystone -verbose = True - -[oslo_messaging_rabbit] -rabbit_host = {{ internal_vip.ip }} -rabbit_userid = {{ RABBIT_USER }} -rabbit_password = {{ RABBIT_PASS }} - -[database] -connection = mongodb://ceilometer:{{ CEILOMETER_DBPASS }}@{{ internal_vip.ip }}:27017/ceilometer - -[keystone_authtoken] -auth_uri = http://{{ internal_vip.ip }}:5000 -auth_url = http://{{ internal_vip.ip }}:35357 -identity_uri = http://{{ internal_vip.ip }}:35357 -auth_plugin = password -project_domain_id = default -user_domain_id = default -project_name = service -username = ceilometer -password = {{ CEILOMETER_PASS }} - -[service_credentials] -os_auth_url = http://{{ internal_vip.ip }}:5000/v2.0 -os_username = ceilometer -os_tenant_name = service -os_password = {{ CEILOMETER_PASS }} -os_endpoint_type = internalURL -os_region_name = RegionOne - -[publisher] -metering_secret = {{ metering_secret }} - -[api] -host = {{ internal_ip }} diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/templates/cinder.j2 b/deploy/adapters/ansible/roles/ceilometer_controller/templates/cinder.j2 deleted file mode 100644 index dfd04739..00000000 --- a/deploy/adapters/ansible/roles/ceilometer_controller/templates/cinder.j2 +++ /dev/null @@ -1,2 +0,0 @@ -[DEFAULT] -notification_driver = messagingv2 diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/templates/glance.j2 b/deploy/adapters/ansible/roles/ceilometer_controller/templates/glance.j2 deleted file mode 100644 index a513d2c1..00000000 --- a/deploy/adapters/ansible/roles/ceilometer_controller/templates/glance.j2 +++ /dev/null @@ -1,8 +0,0 @@ -[DEFAULT] -notification_driver = messagingv2 -rpc_backend = rabbit - -[oslo_messaging_rabbit] -rabbit_host = {{ internal_vip.ip }} -rabbit_userid = {{ RABBIT_USER }} -rabbit_password = {{ RABBIT_PASS }} diff --git a/deploy/adapters/ansible/roles/keystone/templates/admin-openrc-v3.sh b/deploy/adapters/ansible/roles/keystone/templates/admin-openrc-v3.sh deleted file mode 100644 index c3d863e8..00000000 --- a/deploy/adapters/ansible/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 - - |