summaryrefslogtreecommitdiffstats
path: root/deploy/conf
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-02-18 00:55:42 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-02-18 00:55:42 +0000
commit6cc26dd218e9277f748cee30c222cdb1c420a848 (patch)
tree9265d4d20529b9b5951ce1f31f34471ed7406053 /deploy/conf
parentc3f89eca0c74f587f833c5884aa7f1b3d96827c3 (diff)
parentb67c6b64b8e2c08f40051adf5a839241e78dca7d (diff)
Merge "Improvement: reset compute nodes for opencontrail"
Diffstat (limited to 'deploy/conf')
-rw-r--r--deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-ocl-nofeature-ha.yml12
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml12
-rw-r--r--deploy/conf/vm_environment/os-ocl-nofeature-ha.yml12
3 files changed, 9 insertions, 27 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
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