x
/
compass-core
Code Issues Proposed changes

Add local repo 

Change-Id: Ib899b4a8e009486a8c23c53a038133445be32cdb
This commit is contained in:
Xicheng Chang 2014-09-26 11:41:17 -07:00
parent 4da902bec3
commit 3f79f5e7e8
5 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
conf/os_metadata/general.conf
View File

@ -30,9 +30,9 @@ METADATA = {
'http_proxy': {
'_self': {
'field': 'general',
'default_value': 'http://$ipaddr:3128',
'default_value': 'http://10.145.89.126:3128',
'options': [
'http://$ipaddr:3128'
'http://10.145.89.126:3128'
],
'mapping_to': 'http_proxy'
}
@ -40,9 +40,9 @@ METADATA = {
'https_proxy': {
'_self': {
'field': 'general',
'default_value': 'http://$ipaddr:3128',
'default_value': 'http://10.145.89.126:3128',
'options': [
'http://$ipaddr:3128'
'http://10.145.89.126:3128'
],
'mapping_to': 'https_proxy'
}
@ -52,13 +52,13 @@ METADATA = {
'field': 'general_list',
'default_value': [
'127.0.0.1',
'$hostname',
'$ipaddr'
'xicheng-126',
'10.145.89.126'
],
'options': [
'127.0.0.1',
'$hostname',
'$ipaddr'
'xicheng-126',
'10.145.89.126'
],
'mapping_to': 'no_proxy'
}
@ -67,9 +67,9 @@ METADATA = {
'_self': {
'is_required': True,
'field': 'general',
'default_value': '$ipaddr',
'default_value': '10.145.89.126',
'options': [
'$ipaddr'
'10.145.89.126'
],
'mapping_to': 'ntp_server'
}
@ -79,10 +79,10 @@ METADATA = {
'is_required': True,
'field': 'general_list',
'default_value': [
'$ipaddr',
'10.145.89.126',
],
'options': [
'$ipaddr'
'10.145.89.126'
],
'mapping_to': 'nameservers'
}
@ -91,17 +91,17 @@ METADATA = {
'_self': {
'field': 'general',
'is_required' : True,
'default_value': ['$domain'][0],
'options': ['$domain'],
'default_value': ['ods.com'][0],
'options': ['ods.com'],
}
},
'search_path': {
'_self': {
'field': 'general_list',
'default_value': [
'$domain'
'ods.com'
],
'options': ['$domain'],
'options': ['ods.com'],
'mapping_to': 'search_path'
}
},
@ -109,9 +109,16 @@ METADATA = {
'_self': {
'is_required': True,
'field': 'ip',
'default_value': '$gateway',
'default_value': '10.145.88.1',
'mapping_to': 'gateway'
}
},
'local_repo': {
'_self': {
'field': 'general',
'default_value': 'http://10.145.89.126/',
'mapping_to': 'local_repo'
}
}
},
'server_credentials': {

2
conf/templates/chef_installer/openstack_icehouse/environments/allinone.tmpl
View File

@ -3,6 +3,7 @@
## allinone compute management IP/interface
#set allinone_compute_mgmt_nic = $allinone_compute.management.interface
#set allinone_compute_mgmt_ip = $allinone_compute.management.ip
{
"name": "testing",
"description": "Environment used in testing the upstream cookbooks and reference Chef repository",
@ -11,6 +12,7 @@
"json_class": "Chef::Environment",
"chef_type": "environment",
"default_attributes": {
"local_repo": ""
},
"override_attributes": {
"mysql": {

1
conf/templates/chef_installer/openstack_icehouse/environments/multinodes.tmpl
View File

@ -74,6 +74,7 @@
"json_class": "Chef::Environment",
"chef_type": "environment",
"default_attributes": {
"local_repo": "",
"mysql": {
"server_root_password": "test",
"server_debian_password": "root",

3
conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl
View File

@ -58,6 +58,7 @@
"https_proxy": "$getVar('https_proxy', '')",
"ntp_server": "$ntp_server",
"timezone": "$timezone",
"ignore_proxy": "$no_proxy"
"ignore_proxy": "$no_proxy",
"local_repo": "$local_repo"
}
}

1
conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl
View File

@ -59,5 +59,6 @@
"ntp_server": "$ntp_server",
"timezone": "$timezone",
"ignore_proxy": "$no_proxy"
"local_repo": "$local_repo"
}
}