diff options
| -rw-r--r-- | build/build.conf | 2 | ||||
| -rw-r--r-- | deploy/conf/base.conf | 2 | ||||
| -rw-r--r-- | deploy/config_parse.py | 5 | ||||
| -rwxr-xr-x | deploy/deploy_parameter.sh | 4 | ||||
| -rw-r--r-- | deploy/template/power/ipmitool.tmpl | 14 |
5 files changed, 19 insertions, 8 deletions
diff --git a/build/build.conf b/build/build.conf index bcbf2d75..b73de206 100644 --- a/build/build.conf +++ b/build/build.conf @@ -8,7 +8,7 @@ export CENTOS_BASE=${CENTOS_BASE:-$PACKAGE_URL/CentOS-7-x86_64-Minimal-1511.iso} # Compass git repository export COMPASS_CORE=${COMPASS_CORE:-https://github.com/openstack/compass-core.git} -export COMPASS_WEB=${COMPASS_WEB:-http://github.com/baigk/compass-web.git} +export COMPASS_WEB=${COMPASS_WEB:-https://github.com/openstack/compass-web.git} export COMPASS_INSTALL=${COMPASS_INSTALL:-http://github.com/baigk/compass-install.git} # Compass core packages diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf index 0c221e9e..540efec7 100644 --- a/deploy/conf/base.conf +++ b/deploy/conf/base.conf @@ -1,4 +1,4 @@ -export ISO_URL=${ISO_URL:-http://58.251.166.184:9999/compass.iso} +export ISO_URL=${ISO_URL:-file://`pwd`/work/building/compass.iso} export INSTALL_IP=${INSTALL_IP:-10.1.0.12} export INSTALL_MASK=${INSTALL_MASK:-255.255.255.0} export INSTALL_GW=${INSTALL_GW:-10.1.0.1} diff --git a/deploy/config_parse.py b/deploy/config_parse.py index 172388ce..63269f3b 100644 --- a/deploy/config_parse.py +++ b/deploy/config_parse.py @@ -34,7 +34,7 @@ def hostroles(s, seq, host=None): def hostmacs(s, seq, host=None): return host.get('mac', '') -def export_config_file(s, conf_dir, ofile): +def export_config_file(s, config_file, conf_dir, ofile): env = {} env.update(s) if env.get('hosts', []): @@ -47,6 +47,7 @@ def export_config_file(s, conf_dir, ofile): env.update({'FLAVOR': s.get('FLAVOR', "cluster")}) env.update({'HOSTNAMES': hostnames(s, ',')}) env.update({'HOST_ROLES': hostroles(s, ';')}) + env.update({'DHA': config_file}) value = hostmacs(s, ',') if len(value) > 0: @@ -82,7 +83,7 @@ if __name__ == "__main__": data = init(config_file) - export_config_file(data, conf_dir, os.path.join(output_dir, output_file)) + export_config_file(data, config_file, conf_dir, os.path.join(output_dir, output_file)) export_reset_file(data, tmpl_dir, output_dir, os.path.join(output_dir, output_file)) sys.exit(0) diff --git a/deploy/deploy_parameter.sh b/deploy/deploy_parameter.sh index c370ba54..d8696ce8 100755 --- a/deploy/deploy_parameter.sh +++ b/deploy/deploy_parameter.sh @@ -42,9 +42,7 @@ function get_conf_name() done if [[ $# -eq 0 ]]; then - export DHA="$COMPASS_DIR/deploy/conf/virtual_cluster.yml" - elif [[ "$1" == "five" ]];then - export DHA="$COMPASS_DIR/deploy/conf/virtual_five.yml" + export DHA="$COMPASS_DIR/deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml" else file=${1%*.yml}.yml if [[ -f $file ]]; then diff --git a/deploy/template/power/ipmitool.tmpl b/deploy/template/power/ipmitool.tmpl index 73278e45..a297e001 100644 --- a/deploy/template/power/ipmitool.tmpl +++ b/deploy/template/power/ipmitool.tmpl @@ -27,7 +27,19 @@ exit 1 #else #set interface='lan' #end if - +for i in {1..5}; do + if ipmitool -I $interface -H $ipmiIp -U $ipmiUser -P $ipmiPass chassis power on >/dev/null 2>&1 + then + break + elif [[ i -lt 5 ]] + then + sleep 1 + else + log_error "$ipmiIp power on fail" + exit 1 + fi +done +sleep 1 for i in {1..5}; do if ipmitool -I $interface -H $ipmiIp -U $ipmiUser -P $ipmiPass chassis bootdev pxe >/dev/null 2>&1 then |