diff --git a/conf/templates/chef_installer/openstack_icehouse/environments/allinone.tmpl b/conf/templates/chef_installer/openstack_icehouse/environments/allinone.tmpl index 51387b74..3cae474e 100644 --- a/conf/templates/chef_installer/openstack_icehouse/environments/allinone.tmpl +++ b/conf/templates/chef_installer/openstack_icehouse/environments/allinone.tmpl @@ -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", diff --git a/install/dependency.sh b/install/dependency.sh index 79df9c42..97e42ae3 100755 --- a/install/dependency.sh +++ b/install/dependency.sh @@ -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 diff --git a/regtest/regtest.conf b/regtest/regtest.conf index c22b2b7d..b20b22b6 100644 --- a/regtest/regtest.conf +++ b/regtest/regtest.conf @@ -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:-}