diff options
| author |   meimei <meimei@huawei.com> | 2016-06-14 10:52:16 +0800 |
|---|---|---|
| committer | mei mei <meimei@huawei.com> | 2016-06-14 07:07:19 +0000 |
| commit | 229d86a12ccdbe63b8ce702127f846b128f18077 (patch) | |
| tree | 2bd153668de6890e5a4b62d34291ce060be5d46a | |
| parent | cccd08f57d3d13bd9f1d541740d7a67fbbca08c4 (diff) | |
bugfix: wrong configuration of pod2
JIRA: compass-bugfix
Change-Id: Ia512330839fdd821932a5bb5975c5f2312d2755b
Signed-off-by: meimei <meimei@huawei.com>
3 files changed, 75 insertions, 66 deletions
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml index 0492efdb..ccf014e5 100644 --- a/deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml @@ -3,54 +3,57 @@ TYPE: baremetal FLAVOR: cluster POWER_TOOL: ipmitool -ipmiUser: root ipmiVer: '2.0' hosts: - name: host1 - mac: 'F8:4A:BF:55:A2:8D' - interfaces: - - eth1: 'F8:4A:BF:55:A2:8E' - ipmiIp: 172.16.130.26 + mac: 'EC:38:8F:79:0C:2C' + ipmiUser: root ipmiPass: Huawei@123 + ipmiIp: 172.16.130.20 + interfaces: + - eth1: 'EC:38:8F:79:0C:2D' roles: - controller - ha - opencontrail - name: host2 - mac: 'D8:49:0B:DA:5A:B7' + mac: 'EC:38:8F:79:0C:48' + ipmiIp: 172.16.130.19 + ipmiUser: root + ipmiPass: Huawei@123 interfaces: - - eth1: 'D8:49:0B:DA:5A:B8' - ipmiIp: 172.16.130.27 - ipmiPass: huawei@123 + - eth1: 'EC:38:8F:79:0C:49' roles: - compute - name: host3 - mac: 'D8:49:0B:DA:2A:28' - interfaces: - - eth1: 'D8:49:0B:DA:2A:29' - ipmiIp: 172.16.130.29 + mac: 'EC:38:8F:79:10:CC' + ipmiIp: 172.16.130.18 + ipmiUser: root ipmiPass: Huawei@123 + interfaces: + - eth1: 'EC:38:8F:79:10:CD' roles: - compute - name: host4 - mac: 'D8:49:0B:DA:5B:5D' - interfaces: - - eth1: 'D8:49:0B:DA:5B:5E' - ipmiIp: 172.16.130.30 + mac: 'EC:38:8F:79:0C:6C' + ipmiIp: 172.16.130.17 + ipmiUser: root ipmiPass: Huawei@123 + interfaces: + - eth1: 'EC:38:8F:79:0C:6D' roles: - compute - name: host5 - mac: 'D8:49:0B:DA:56:85' - interfaces: - - eth1: 'D8:49:0B:DA:56:86' - ipmiIp: 172.16.130.31 + mac: 'EC:38:8F:7A:E6:ED' + ipmiIp: 172.16.130.16 + ipmiUser: root ipmiPass: Huawei@123 + interfaces: + - eth1: 'EC:38:8F:7A:E6:EE' roles: - compute - diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-nofeature-ha.yml index ce10bab9..b5fe5590 100644 --- a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-nofeature-ha.yml @@ -3,58 +3,61 @@ TYPE: baremetal FLAVOR: cluster POWER_TOOL: ipmitool -ipmiUser: root ipmiVer: '2.0' hosts: - name: host1 - mac: 'F8:4A:BF:55:A2:8D' - interfaces: - - eth1: 'F8:4A:BF:55:A2:8E' - ipmiIp: 172.16.130.26 + mac: 'EC:38:8F:79:0C:2C' + ipmiUser: root ipmiPass: Huawei@123 + ipmiIp: 172.16.130.20 + interfaces: + - eth1: 'EC:38:8F:79:0C:2D' roles: - controller - ha - odl - name: host2 - mac: 'D8:49:0B:DA:5A:B7' + mac: 'EC:38:8F:79:0C:48' + ipmiIp: 172.16.130.19 + ipmiUser: root + ipmiPass: Huawei@123 interfaces: - - eth1: 'D8:49:0B:DA:5A:B8' - ipmiIp: 172.16.130.27 - ipmiPass: huawei@123 + - eth1: 'EC:38:8F:79:0C:49' roles: - controller - ha - odl - name: host3 - mac: 'D8:49:0B:DA:2A:28' - interfaces: - - eth1: 'D8:49:0B:DA:2A:29' - ipmiIp: 172.16.130.29 + mac: 'EC:38:8F:79:10:CC' + ipmiIp: 172.16.130.18 + ipmiUser: root ipmiPass: Huawei@123 + interfaces: + - eth1: 'EC:38:8F:79:10:CD' roles: - controller - ha - odl - name: host4 - mac: 'D8:49:0B:DA:5B:5D' - interfaces: - - eth1: 'D8:49:0B:DA:5B:5E' - ipmiIp: 172.16.130.30 + mac: 'EC:38:8F:79:0C:6C' + ipmiIp: 172.16.130.17 + ipmiUser: root ipmiPass: Huawei@123 + interfaces: + - eth1: 'EC:38:8F:79:0C:6D' roles: - compute - name: host5 - mac: 'D8:49:0B:DA:56:85' - interfaces: - - eth1: 'D8:49:0B:DA:56:86' - ipmiIp: 172.16.130.31 + mac: 'EC:38:8F:7A:E6:ED' + ipmiIp: 172.16.130.16 + ipmiUser: root ipmiPass: Huawei@123 + interfaces: + - eth1: 'EC:38:8F:7A:E6:EE' roles: - compute - diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml index 9b05aded..f89e5df2 100644 --- a/deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml @@ -3,58 +3,61 @@ TYPE: baremetal FLAVOR: cluster POWER_TOOL: ipmitool -ipmiUser: root ipmiVer: '2.0' hosts: - name: host1 - mac: 'F8:4A:BF:55:A2:8D' - interfaces: - - eth1: 'F8:4A:BF:55:A2:8E' - ipmiIp: 172.16.130.26 + mac: 'EC:38:8F:79:0C:2C' + ipmiUser: root ipmiPass: Huawei@123 + ipmiIp: 172.16.130.20 + interfaces: + - eth1: 'EC:38:8F:79:0C:2D' roles: - controller - ha - onos - name: host2 - mac: 'D8:49:0B:DA:5A:B7' + mac: 'EC:38:8F:79:0C:48' + ipmiIp: 172.16.130.19 + ipmiUser: root + ipmiPass: Huawei@123 interfaces: - - eth1: 'D8:49:0B:DA:5A:B8' - ipmiIp: 172.16.130.27 - ipmiPass: huawei@123 + - eth1: 'EC:38:8F:79:0C:49' roles: - controller - ha - onos - name: host3 - mac: 'D8:49:0B:DA:2A:28' - interfaces: - - eth1: 'D8:49:0B:DA:2A:29' - ipmiIp: 172.16.130.29 + mac: 'EC:38:8F:79:10:CC' + ipmiIp: 172.16.130.18 + ipmiUser: root ipmiPass: Huawei@123 + interfaces: + - eth1: 'EC:38:8F:79:10:CD' roles: - controller - ha - onos - name: host4 - mac: 'D8:49:0B:DA:5B:5D' - interfaces: - - eth1: 'D8:49:0B:DA:5B:5E' - ipmiIp: 172.16.130.30 + mac: 'EC:38:8F:79:0C:6C' + ipmiIp: 172.16.130.17 + ipmiUser: root ipmiPass: Huawei@123 + interfaces: + - eth1: 'EC:38:8F:79:0C:6D' roles: - compute - name: host5 - mac: 'D8:49:0B:DA:56:85' - interfaces: - - eth1: 'D8:49:0B:DA:56:86' - ipmiIp: 172.16.130.31 + mac: 'EC:38:8F:7A:E6:ED' + ipmiIp: 172.16.130.16 + ipmiUser: root ipmiPass: Huawei@123 + interfaces: + - eth1: 'EC:38:8F:7A:E6:EE' roles: - compute - |