diff --git a/conf/os_metadata/general.conf b/conf/os_metadata/general.conf index 840bee24..1924e1b0 100644 --- a/conf/os_metadata/general.conf +++ b/conf/os_metadata/general.conf @@ -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': { diff --git a/conf/templates/chef_installer/openstack_icehouse/environments/allinone.tmpl b/conf/templates/chef_installer/openstack_icehouse/environments/allinone.tmpl index e730fec5..9dc04b84 100644 --- a/conf/templates/chef_installer/openstack_icehouse/environments/allinone.tmpl +++ b/conf/templates/chef_installer/openstack_icehouse/environments/allinone.tmpl @@ -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": { diff --git a/conf/templates/chef_installer/openstack_icehouse/environments/multinodes.tmpl b/conf/templates/chef_installer/openstack_icehouse/environments/multinodes.tmpl index aab26ebc..ba80d34e 100644 --- a/conf/templates/chef_installer/openstack_icehouse/environments/multinodes.tmpl +++ b/conf/templates/chef_installer/openstack_icehouse/environments/multinodes.tmpl @@ -74,6 +74,7 @@ "json_class": "Chef::Environment", "chef_type": "environment", "default_attributes": { + "local_repo": "", "mysql": { "server_root_password": "test", "server_debian_password": "root", diff --git a/conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl b/conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl index 122a7172..2f0648c3 100644 --- a/conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl +++ b/conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl @@ -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" } } diff --git a/conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl b/conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl index 122a7172..95fbaa0b 100644 --- a/conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl +++ b/conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl @@ -59,5 +59,6 @@ "ntp_server": "$ntp_server", "timezone": "$timezone", "ignore_proxy": "$no_proxy" + "local_repo": "$local_repo" } }