diff options
| author |   Justin chi <chigang@huawei.com> | 2015-10-24 07:42:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-10-24 07:42:48 +0000 |
| commit | 951186fee0c3a83fe380cc7545edcbdc6872e509 (patch) | |
| tree | 2085d756fe33b66b3f775c9034edbe3368c0464d /deploy | |
| parent | 91f52bf10c37935c3a1299eb5abf0ea50ab0d231 (diff) | |
| parent | 78b926e43ab0d523205b223ed17ef1c3560e9607 (diff) | |
Merge "bug fix: support impi 2.0 and delete compass core default ip and gw when baremetal deploy"
Diffstat (limited to 'deploy')
| -rw-r--r-- | deploy/compass_vm.sh | 1 | ||||
| -rw-r--r-- | deploy/conf/baremetal_cluster_sh.yml | 1 | ||||
| -rw-r--r-- | deploy/conf/compass.conf | 8 | ||||
| -rw-r--r-- | deploy/template/power/ipmitool.tmpl | 12 |
4 files changed, 16 insertions, 6 deletions
diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh index 9e192281..5c1a526d 100644 --- a/deploy/compass_vm.sh +++ b/deploy/compass_vm.sh @@ -30,6 +30,7 @@ function install_compass_core() { function wait_ok() { set +x log_info "wait_compass_ok enter" + ssh-keygen -f "/root/.ssh/known_hosts" -R $MGMT_IP >/dev/null 2>&1 retry=0 until timeout 1s ssh $ssh_args root@$MGMT_IP "exit" >/dev/null 2>&1 do diff --git a/deploy/conf/baremetal_cluster_sh.yml b/deploy/conf/baremetal_cluster_sh.yml index 1078cb5c..fe329548 100644 --- a/deploy/conf/baremetal_cluster_sh.yml +++ b/deploy/conf/baremetal_cluster_sh.yml @@ -5,6 +5,7 @@ POWER_TOOL: ipmitool ipmiUser: root ipmiPass: Huawei@123 +ipmiVer: '1.0' hosts: - name: host1 diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf index 65f97a93..0bae6d3b 100644 --- a/deploy/conf/compass.conf +++ b/deploy/conf/compass.conf @@ -1,15 +1,15 @@ export COMPASS_VIRT_CPUS=4 export COMPASS_VIRT_MEM=4096 export COMPASS_SERVER=$INSTALL_IP -export COMPASS_SERVER_URL="http://$COMPASS_SERVER/api" +export COMPASS_SERVER_URL="http://$MGMT_IP/api" export HTTP_SERVER_URL="http://$MGMT_IP/api" export COMPASS_USER_EMAIL="admin@huawei.com" export COMPASS_USER_PASSWORD="admin" export COMPASS_DNS1=${COMPASS_DNS1:-'8.8.8.8'} export COMPASS_DNS2=${COMPASS_DNS2:-} -export COMPASS_EXTERNAL_IP=${COMPASS_EXTERNAL_IP:-192.168.124.221} -export COMPASS_EXTERNAL_MASK=${COMPASS_EXTERNAL_MASK:-255.255.252.0} -export COMPASS_EXTERNAL_GW=${COMPASS_EXTERNAL_GW:-192.168.124.1} +export COMPASS_EXTERNAL_IP=${COMPASS_EXTERNAL_IP:-} +export COMPASS_EXTERNAL_MASK=${COMPASS_EXTERNAL_MASK:-} +export COMPASS_EXTERNAL_GW=${COMPASS_EXTERNAL_GW:-} export LANGUAGE="EN" export TIMEZONE="America/Los_Angeles" export NTP_SERVER="$COMPASS_SERVER" diff --git a/deploy/template/power/ipmitool.tmpl b/deploy/template/power/ipmitool.tmpl index 5d2630af..73278e45 100644 --- a/deploy/template/power/ipmitool.tmpl +++ b/deploy/template/power/ipmitool.tmpl @@ -1,6 +1,7 @@ source \${COMPASS_DIR}/util/log.sh #set default_ipmiUser=$getVar('ipmiUser', '') #set default_ipmiPass=$getVar('ipmiPass', '') +#set default_ipmiVer=$getVar('ipmiVer', '2.0') #set hosts=$getVar('hosts', []) #set fail_list="" #for host in $hosts @@ -20,8 +21,15 @@ exit 1 #set ipmiIp=$host.get('ipmiIp', '') #set ipmiUser=$host.get('ipmiUser', $default_ipmiUser) #set ipmiPass=$host.get('ipmiPass', $default_ipmiPass) +#set ipmiVer=$host.get('ipmiVer', $default_ipmiVer) +#if $ipmiVer == '2.0' + #set interface='lanplus' +#else + #set interface='lan' +#end if + for i in {1..5}; do - if ipmitool -I lan -H $ipmiIp -U $ipmiUser -P $ipmiPass chassis bootdev pxe >/dev/null 2>&1 + if ipmitool -I $interface -H $ipmiIp -U $ipmiUser -P $ipmiPass chassis bootdev pxe >/dev/null 2>&1 then break elif [[ i -lt 5 ]] @@ -34,7 +42,7 @@ for i in {1..5}; do done sleep 1 for i in {1..5}; do - if ipmitool -I lan -H $ipmiIp -U $ipmiUser -P $ipmiPass chassis power reset >/dev/null 2>&1 + if ipmitool -I $interface -H $ipmiIp -U $ipmiUser -P $ipmiPass chassis power reset >/dev/null 2>&1 then break elif [[ i -lt 5 ]] |