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>

8 files changed, 0 insertions, 151 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
-
-
diff --git a/deploy/compass_conf/os/centos7.0.conf b/deploy/compass_conf/os/centos7.0.conf
deleted file mode 100755
index 9dcdf753..00000000
--- a/deploy/compass_conf/os/centos7.0.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-NAME = 'CentOS-7.0-x86_64'
-PARENT = 'CentOS'
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/os/rhel7.2.conf b/deploy/compass_conf/os/rhel7.2.conf
deleted file mode 100755
index bcb5f581..00000000
--- a/deploy/compass_conf/os/rhel7.2.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-NAME = 'rhel-server-7.2-x86_64'
-PARENT = 'CentOS'
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/templates/cobbler/rhel-server-7.2-x86_64/profile.tmpl b/deploy/compass_conf/templates/cobbler/rhel-server-7.2-x86_64/profile.tmpl
deleted file mode 100755
index cfa89004..00000000
--- a/deploy/compass_conf/templates/cobbler/rhel-server-7.2-x86_64/profile.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "repos": "$getVar('repo_name', '')"
-}
diff --git a/deploy/compass_conf/templates/cobbler/rhel-server-7.2-x86_64/system.tmpl b/deploy/compass_conf/templates/cobbler/rhel-server-7.2-x86_64/system.tmpl
deleted file mode 100755
index 8e4cbbbe..00000000
--- a/deploy/compass_conf/templates/cobbler/rhel-server-7.2-x86_64/system.tmpl
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "name": "$hostname",
-    "hostname": "$hostname",
-    "profile": "$profile",
-    "gateway": "$gateway",
-    #import simplejson as json
-    #set nameservers = json.dumps($nameservers, encoding='utf-8')
-    "name_servers": $nameservers,
-    #set search_path = ' '.join($search_path)
-    "name_servers_search": "$search_path",
-    "proxy": "$getVar('http_proxy', '')",
-    "modify_interface":
-        #set networks = $networks
-        #set rekeyed = {}
-        #set promic_nic = ""
-        #for $nic, $val in $networks.iteritems():
-            #set ip_key = '-'.join(('ipaddress', $nic))
-            #set netmask_key = '-'.join(('netmask', $nic))
-            #set mgmt_key = '-'.join(('management', $nic))
-            #set static_key = '-'.join(('static', $nic))
-            #set $rekeyed[$ip_key] = $val.ip
-            #set $rekeyed[$netmask_key] = $val.netmask
-            #set $rekeyed[$mgmt_key] = $val.is_mgmt
-            #set $rekeyed[$static_key] = True
-
-            #set dns_key = '-'.join(('dnsname', $nic))
-            #if $val.is_mgmt
-                #set $rekeyed[$dns_key] = $dns
-            #else
-                #if '.' in $dns
-                    #set $dns_name, $dns_domain = $dns.split('.', 1)
-                    #set $dns_nic = '%s-%s.%s' % ($dns_name, $nic, $dns_domain)
-                #else
-                    #set $dns_nic = '%s-%s' % ($dns, $nic)
-                #end if
-                #set $rekeyed[$dns_key] = $dns_nic
-            #end if
-
-            #if $val.is_promiscuous:
-                #set promic_nic = $nic
-            #end if
-            #if $val.is_mgmt:
-                #set mac_key = '-'.join(('macaddress', $nic))
-                #set $rekeyed[$mac_key] = $mac
-            #end if
-        #end for
-        #set nic_info = json.dumps($rekeyed, encoding='utf-8')
-        $nic_info
-    ,
-    "ksmeta":{
-        #set partition_config = ''
-        #for k, v in $partition.iteritems():
-            #set path = ''
-            #if v['vol_percentage']:
-                #set $path = k + ' ' + str(v['vol_percentage']) + '%'
-            #else:
-                #set $path = k + ' ' + str(v['vol_size'])
-            #end if
-            #set partition_config = ';'.join((partition_config, $path))
-        #end for
-        #set partition_config = partition_config[1:]
-        #import crypt
-        #set $password = crypt.crypt($server_credentials.password, "az")
-        #set no_proxy = ','.join($getVar('no_proxy', []))
-        "username": "$server_credentials.username",
-        "password": "$password",
-        "promisc_nics": "$promic_nic",
-        "partition": "$partition_config",
-        "https_proxy": "$getVar('https_proxy', '')",
-        "ntp_server": "$ntp_server",
-        "timezone": "$timezone",
-        "ignore_proxy": "$no_proxy",
-        "local_repo": "$getVar('local_repo', '')",
-        "disk_num": "1"
-    }
-}