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/compass_conf | |
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/compass_conf')
4 files changed, 0 insertions, 85 deletions
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" - } -} |