Merge "Improvement: reset compute nodes for opencontrail"

7 files changed, 82 insertions, 28 deletions

diff --git a/deploy.sh b/deploy.sh
index 8e362b0f..a5968966 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -17,3 +17,4 @@ if [[ -z $DEPLOY_COMPASS && -z $DEPLOY_HOST && -z $REDEPLOY_HOST ]]; then
 fi
 
 $COMPASS_DIR/deploy/launch.sh $*
+
diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-ocl-nofeature-ha.yml
index 7606687e..0492efdb 100644
--- a/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-ocl-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-ocl-nofeature-ha.yml
@@ -16,7 +16,7 @@ hosts:
     roles:
       - controller
       - ha
-      - open-contrail
+      - opencontrail
 
   - name: host2
     mac: 'D8:49:0B:DA:5A:B7'
@@ -25,9 +25,7 @@ hosts:
     ipmiIp: 172.16.130.27
     ipmiPass: huawei@123
     roles:
-      - controller
-      - ha
-      - open-contrail
+      - compute
 
   - name: host3
     mac: 'D8:49:0B:DA:2A:28'
@@ -36,9 +34,7 @@ hosts:
     ipmiIp: 172.16.130.29
     ipmiPass: Huawei@123
     roles:
-      - controller
-      - ha
-      - open-contrail
+      - compute
 
   - name: host4
     mac: 'D8:49:0B:DA:5B:5D'
@@ -48,7 +44,6 @@ hosts:
     ipmiPass: Huawei@123
     roles:
       - compute
-      - open-contrail
 
   - name: host5
     mac: 'D8:49:0B:DA:56:85'
@@ -58,5 +53,4 @@ hosts:
     ipmiPass: Huawei@123
     roles:
       - compute
-      - open-contrail
 
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml
index 75872efd..7892a0b5 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml
@@ -17,7 +17,7 @@ hosts:
     roles:
       - controller
       - ha
-      - open-contrail
+      - opencontrail
 
   - name: host2
     mac: '00:1E:67:D4:39:B5'
@@ -26,9 +26,7 @@ hosts:
       - eth3: '00:1E:67:C5:52:25'
     ipmiIp: 10.2.117.129
     roles:
-      - controller
-      - ha
-      - open-contrail
+      - compute
 
   - name: host3
     mac: '00:1E:67:D4:31:B2'
@@ -37,9 +35,7 @@ hosts:
       - eth3: '00:1E:67:C1:FA:E1'
     ipmiIp: 10.2.117.131
     roles:
-      - controller
-      - ha
-      - open-contrail
+      - compute
 
   - name: host4
     mac: '00:1E:67:D4:34:67'
@@ -49,7 +45,6 @@ hosts:
     ipmiIp: 10.2.117.133
     roles:
       - compute
-      - open-contrail
 
   - name: host5
     mac: '00:1E:67:D4:38:42'
@@ -59,5 +54,4 @@ hosts:
     ipmiIp: 10.2.117.135
     roles:
       - compute
-      - open-contrail
 
diff --git a/deploy/conf/vm_environment/os-ocl-nofeature-ha.yml b/deploy/conf/vm_environment/os-ocl-nofeature-ha.yml
index 5f4890d6..bdcada8f 100644
--- a/deploy/conf/vm_environment/os-ocl-nofeature-ha.yml
+++ b/deploy/conf/vm_environment/os-ocl-nofeature-ha.yml
@@ -8,30 +8,24 @@ hosts:
       - ha
       - ceph-adm
       - ceph-mon
-      - open-contrail
+      - opencontrail
 
   - name: host2
     roles:
-      - controller
-      - ha
+      - compute
       - ceph-mon
-      - open-contrail
 
   - name: host3
     roles:
-      - controller
-      - ha
+      - compute
       - ceph-mon
-      - open-contrail
 
   - name: host4
     roles:
       - compute
       - ceph-osd
-      - open-contrail
 
   - name: host5
     roles:
       - compute
       - ceph-osd
-      - open-contrail
diff --git a/deploy/deploy_host.sh b/deploy/deploy_host.sh
index 82748743..306f936a 100755
--- a/deploy/deploy_host.sh
+++ b/deploy/deploy_host.sh
@@ -49,5 +49,9 @@ function deploy_host(){
 
     RET=$?
     sleep $((AYNC_TIMEOUT+5))
-    exit $RET
+    if [[ $RET ]]; then
+       /bin/true
+    else
+       /bin/false
+    fi
 }
diff --git a/deploy/launch.sh b/deploy/launch.sh
index 8ee70e47..f9d915bf 100755
--- a/deploy/launch.sh
+++ b/deploy/launch.sh
@@ -78,6 +78,14 @@ if [[ "$DEPLOY_HOST" == "true" || $REDEPLOY_HOST == "true" ]]; then
     if ! deploy_host;then
          exit 1
     fi
+    echo $HOST_ROLES
+    echo $TYPE
+    echo $DHA
+    if [[ `echo $HOST_ROLES | grep opencontrail` ]]; then
+        sleep 60
+        python ${COMPASS_DIR}/deploy/reset_compute.py $TYPE $DHA
+        sleep 600
+    fi
 fi
 
 figlet -ctf slant Installation Complete!
diff --git a/deploy/reset_compute.py b/deploy/reset_compute.py
new file mode 100644
index 00000000..717e8833
--- /dev/null
+++ b/deploy/reset_compute.py
@@ -0,0 +1,59 @@
+import os
+import sys
+import yaml
+
+def exec_cmd(cmd):
+    print cmd
+    os.system(cmd)
+
+def reset_baremetal(dha_info):
+    print "reset_baremetal"
+
+    hosts_info = yaml.load(open(dha_info))
+    #print hosts_info
+
+    ipmiUserDf = hosts_info.get('ipmiUser', 'root')
+    ipmiPassDf = hosts_info.get('ipmiPass', 'Huawei@123')
+    print ipmiUserDf
+    print ipmiPassDf
+
+    hosts_list = hosts_info.get('hosts', [])
+    #print hosts_list
+    
+    for host in hosts_list:
+        print host
+        if ('compute' in host['roles']):
+            ipmiUser = host.get('ipmiUser', ipmiUserDf)
+            ipmiPass = host.get('ipmiPass', ipmiPassDf)
+            ipmiIp = host['ipmiIp']
+            print ipmiUser
+            print ipmiPass
+            print ipmiIp
+            exec_cmd("ipmitool -I lanplus -H %s -U %s -P %s chassis power reset >/dev/null" % (ipmiIp, ipmiUser, ipmiPass))
+
+
+def reset_virtual(dha_info):
+    print "reset_virtual"
+
+    hosts_info = yaml.load(open(dha_info))
+    print hosts_info
+
+    hosts_list = hosts_info.get('hosts', [])
+
+    for host in hosts_list:
+        print host
+        if ('compute' in host['roles']):
+            name = host['name']
+            exec_cmd("virsh destroy %s" % name)
+            exec_cmd("virsh start %s" % name) 
+
+if __name__ == "__main__":
+    deploy_type=sys.argv[1]
+    dha_info=sys.argv[2]
+    print deploy_type
+    print dha_info
+    if (deploy_type == 'baremetal') :
+        reset_baremetal(dha_info)
+    elif (deploy_type == 'virtual') :
+        reset_virtual(dha_info)
+