disable proxy when use proxy

Change-Id: I34ee2a6b1ff3ac754c3d07e34abbed2c1b2e8185
This commit is contained in:
xiaodongwang 2014-10-21 17:20:18 -07:00
parent 97ab3abb39
commit e775a00786
3 changed files with 5 additions and 3 deletions

View File

@ -12,9 +12,7 @@
"json_class": "Chef::Environment",
"chef_type": "environment",
"default_attributes": {
"local_repo": ""
},
"override_attributes": {
"local_repo": "",
"mysql": {
"server_root_password": "test",
"server_debian_password": "root",

View File

@ -43,5 +43,6 @@ sudo chkconfig sshd on
sudo chkconfig rsyslog on
sudo chkconfig ntpd on
sudo chkconfig redis on
sudo chkconfig mysqld on
sudo chkconfig iptables off
sudo chkconfig ip6tables off

View File

@ -38,6 +38,9 @@ export TMP_PERCENTAGE=${TMP_PERCENTAGE:-'5'}
export VAR_PERCENTAGE=${VAR_PERCENTAGE:-'10'}
export PARTITION=${PARTITION:-"/home=${HOME_PERCENTAGE}%,/tmp=${TMP_PERCENTAGE}%,/var=${VAR_PERCENTAGE}%"}
export LOCAL_REPO_URL=${LOCAL_REPO_URL:-"http://$IPADDR"}
if [ -n "$LOCAL_REPO_URL" ]; then
export PROXY=
fi
export OS_CONFIG_FILENAME=${OS_CONFIG_FILENAME:-}
export PACKAGE_CONFIG_FILENAME=${PACKAGE_CONFIG_FILENAME:-}