From c16338e61ecbf5012ab7c8b8f70bd276ed080fdf Mon Sep 17 00:00:00 2001 From: Yifei Xue Date: Sat, 29 Jul 2017 09:04:16 +0800 Subject: Correct the DHA name of SFC scenario The DHA name of SFC scenario in compass4nfv repo is " os-odl_l3-sfc-ha.yml". However, the scenario name on CI master is "os-odl-sfc-ha.yml". So CI failed when read DHA file. THis patch is proposed to fix this problem. Change-Id: Icb8db6c6c023a794bdd803d0365d719a853dc712 Signed-off-by: Yifei Xue --- .../huawei-pod1/os-odl-sfc-ha.yml | 79 ++++++++++++++++++++++ .../huawei-pod1/os-odl_l3-sfc-ha.yml | 79 ---------------------- deploy/conf/vm_environment/os-odl-sfc-ha.yml | 50 ++++++++++++++ deploy/conf/vm_environment/os-odl_l3-sfc-ha.yml | 50 -------------- 4 files changed, 129 insertions(+), 129 deletions(-) create mode 100644 deploy/conf/hardware_environment/huawei-pod1/os-odl-sfc-ha.yml delete mode 100644 deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-sfc-ha.yml create mode 100644 deploy/conf/vm_environment/os-odl-sfc-ha.yml delete mode 100644 deploy/conf/vm_environment/os-odl_l3-sfc-ha.yml (limited to 'deploy') diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-odl-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl-sfc-ha.yml new file mode 100644 index 00000000..8095fe03 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod1/os-odl-sfc-ha.yml @@ -0,0 +1,79 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +--- +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +odl_l3_agent: "Enable" +plugins: + - opendaylight: "Enable" + - odl_sfc: "Enable" + +hosts: + - name: host1 + mac: 'F8:4A:BF:55:A2:8D' + interfaces: + - eth1: 'F8:4A:BF:55:A2:8E' + ipmiIp: 172.16.130.26 + ipmiPass: Opnfv@pod1 + roles: + - controller + - ha + - odl + - ceph-adm + - ceph-mon + + - name: host2 + mac: 'D8:49:0B:DA:5A:B7' + interfaces: + - eth1: 'D8:49:0B:DA:5A:B8' + ipmiIp: 172.16.130.27 + ipmiPass: Opnfv@pod1 + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host3 + mac: '78:D7:52:A0:B1:99' + interfaces: + - eth1: '78:D7:52:A0:B1:9A' + ipmiIp: 172.16.130.29 + ipmiPass: Opnfv@pod1 + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host4 + mac: 'D8:49:0B:DA:5B:5D' + interfaces: + - eth1: 'D8:49:0B:DA:5B:5E' + ipmiIp: 172.16.130.30 + ipmiPass: Opnfv@pod1 + roles: + - compute + - ceph-osd + + - name: host5 + mac: 'D8:49:0B:DA:56:85' + interfaces: + - eth1: 'D8:49:0B:DA:56:86' + ipmiIp: 172.16.130.31 + ipmiPass: Opnfv@pod1 + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-sfc-ha.yml deleted file mode 100644 index 8095fe03..00000000 --- a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-sfc-ha.yml +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -TYPE: baremetal -FLAVOR: cluster -POWER_TOOL: ipmitool - -ipmiUser: root -ipmiVer: '2.0' - -odl_l3_agent: "Enable" -plugins: - - opendaylight: "Enable" - - odl_sfc: "Enable" - -hosts: - - name: host1 - mac: 'F8:4A:BF:55:A2:8D' - interfaces: - - eth1: 'F8:4A:BF:55:A2:8E' - ipmiIp: 172.16.130.26 - ipmiPass: Opnfv@pod1 - roles: - - controller - - ha - - odl - - ceph-adm - - ceph-mon - - - name: host2 - mac: 'D8:49:0B:DA:5A:B7' - interfaces: - - eth1: 'D8:49:0B:DA:5A:B8' - ipmiIp: 172.16.130.27 - ipmiPass: Opnfv@pod1 - roles: - - controller - - ha - - odl - - ceph-mon - - - name: host3 - mac: '78:D7:52:A0:B1:99' - interfaces: - - eth1: '78:D7:52:A0:B1:9A' - ipmiIp: 172.16.130.29 - ipmiPass: Opnfv@pod1 - roles: - - controller - - ha - - odl - - ceph-mon - - - name: host4 - mac: 'D8:49:0B:DA:5B:5D' - interfaces: - - eth1: 'D8:49:0B:DA:5B:5E' - ipmiIp: 172.16.130.30 - ipmiPass: Opnfv@pod1 - roles: - - compute - - ceph-osd - - - name: host5 - mac: 'D8:49:0B:DA:56:85' - interfaces: - - eth1: 'D8:49:0B:DA:56:86' - ipmiIp: 172.16.130.31 - ipmiPass: Opnfv@pod1 - roles: - - compute - - ceph-osd diff --git a/deploy/conf/vm_environment/os-odl-sfc-ha.yml b/deploy/conf/vm_environment/os-odl-sfc-ha.yml new file mode 100644 index 00000000..4673c58d --- /dev/null +++ b/deploy/conf/vm_environment/os-odl-sfc-ha.yml @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +--- +TYPE: virtual +FLAVOR: cluster + +odl_l3_agent: "Enable" +plugins: + - opendaylight: "Enable" + - odl_sfc: "Enable" + +hosts: + - name: host1 + roles: + - controller + - ha + - odl + - ceph-adm + - ceph-mon + + - name: host2 + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host3 + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host4 + roles: + - compute + - ceph-osd + + - name: host5 + roles: + - compute + - ceph-osd diff --git a/deploy/conf/vm_environment/os-odl_l3-sfc-ha.yml b/deploy/conf/vm_environment/os-odl_l3-sfc-ha.yml deleted file mode 100644 index 4673c58d..00000000 --- a/deploy/conf/vm_environment/os-odl_l3-sfc-ha.yml +++ /dev/null @@ -1,50 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -TYPE: virtual -FLAVOR: cluster - -odl_l3_agent: "Enable" -plugins: - - opendaylight: "Enable" - - odl_sfc: "Enable" - -hosts: - - name: host1 - roles: - - controller - - ha - - odl - - ceph-adm - - ceph-mon - - - name: host2 - roles: - - controller - - ha - - odl - - ceph-mon - - - name: host3 - roles: - - controller - - ha - - odl - - ceph-mon - - - name: host4 - roles: - - compute - - ceph-osd - - - name: host5 - roles: - - compute - - ceph-osd -- cgit 1.2.3-korg