Improvement: reset compute nodes for opencontrail

JIRA: COMPASS-317

Change-Id: I27b6bb3aa8707f02a51951eed83646a78dafc841
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>

2 files changed, 6 insertions, 18 deletions

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