diff options
Diffstat (limited to 'deploy/conf')
62 files changed, 1986 insertions, 207 deletions
diff --git a/deploy/conf/baremetal.conf b/deploy/conf/baremetal.conf index 56903c77..12f3acb7 100644 --- a/deploy/conf/baremetal.conf +++ b/deploy/conf/baremetal.conf @@ -1,5 +1,5 @@ export SWITCH_IPS="192.168.124.2" export SWITCH_CREDENTIAL="version=2c,community=public" -export DEPLOYMENT_TIMEOUT="150" +export DEPLOYMENT_TIMEOUT="300" export POLL_SWITCHES_FLAG="nopoll_switches" export INSTALL_NIC=${INSTALL_NIC:-eth3} diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf index 7b9d8290..bdbea459 100644 --- a/deploy/conf/base.conf +++ b/deploy/conf/base.conf @@ -1,17 +1,17 @@ export DHA=${DHA:-$COMPASS_DIR/deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml} export NEUTRON=${NEUTRON:-$COMPASS_DIR/deploy/conf/neutron_cfg.yaml} export NETWORK=${NETWORK:-$COMPASS_DIR/deploy/conf/network_cfg.yaml} -export ISO_URL=${ISO_URL:-file://`pwd`/work/building/compass.iso} -export INSTALL_IP=${INSTALL_IP:-10.1.0.12} +export TAR_URL=${TAR_URL:-file://`pwd`/work/building/compass.tar.gz} +export INSTALL_IP=${INSTALL_IP:-10.1.0.1} export INSTALL_MASK=${INSTALL_MASK:-255.255.255.0} export INSTALL_GW=${INSTALL_GW:-10.1.0.1} export INSTALL_IP_START=${INSTALL_IP_START:-10.1.0.1} export INSTALL_IP_END=${INSTALL_IP_END:-10.1.0.254} -export MGMT_IP=${MGMT_IP:-192.168.200.2} -export MGMT_MASK=${MGMT_MASK:-255.255.252.0} -export MGMT_GW=${MGMT_GW:-192.168.200.1} -export MGMT_IP_START=${MGMT_IP_START:-192.168.200.3} -export MGMT_IP_END=${MGMT_IP_END:-192.168.200.254} +export MGMT_IP=${MGMT_IP:-10.1.0.1} +export EXT_NAT_MASK=${EXT_NAT_MASK:-255.255.252.0} +export EXT_NAT_GW=${EXT_NAT_GW:-192.16.1.1} +export EXT_NAT_IP_START=${EXT_NAT_IP_START:-192.16.1.3} +export EXT_NAT_IP_END=${EXT_NAT_IP_END:-192.16.1.254} export EXTERNAL_NIC=${EXTERNAL_NIC:-eth0} export CLUSTER_NAME="opnfv2" export DOMAIN="ods.com" @@ -68,3 +68,4 @@ export OS_CONFIG_FILENAME="" export SERVICE_CREDENTIALS="image:service=service,compute:service=service,dashboard:service=service,identity:service=service,image:service=service,metering:service=service,network:service=service,rabbitmq:service=service,volume:service=service,mysql:service=service,heat:heat=heat_db_secret,alarming:aodh=aodh_db_secret,policy:congress=service" export CONSOLE_CREDENTIALS="admin:console=console,demo:console=console,compute:console=console,dashboard:console=console,identity:console=console,image:console=console,metering:console=console,network:console=console,object-store:console=console,volume:console=console,heat:heat=heat_secret,alarming:aodh=aodh_secret,policy:congress=console" export PACKAGE_CONFIG_FILENAME="" +export MOON_CFG=${MOON_CFG:-"master:flag=Disable,slave:flag=Disable,slave:name=slave1,slave:master_ip=master_ip"} diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf index 6e38d703..4ea087d6 100644 --- a/deploy/conf/compass.conf +++ b/deploy/conf/compass.conf @@ -1,8 +1,8 @@ export COMPASS_VIRT_CPUS=4 export COMPASS_VIRT_MEM=4096 export COMPASS_SERVER=$INSTALL_IP -export COMPASS_SERVER_URL="http://$MGMT_IP/api" -export HTTP_SERVER_URL="http://$MGMT_IP/api" +export COMPASS_SERVER_URL="http://$MGMT_IP:5050/api" +export HTTP_SERVER_URL="http://$MGMT_IP:5050/api" export COMPASS_USER_EMAIL="admin@huawei.com" export COMPASS_USER_PASSWORD="admin" export COMPASS_DNS1=${COMPASS_DNS1:-'8.8.8.8'} @@ -11,6 +11,12 @@ export COMPASS_EXTERNAL_IP=${COMPASS_EXTERNAL_IP:-} export COMPASS_EXTERNAL_MASK=${COMPASS_EXTERNAL_MASK:-} export COMPASS_EXTERNAL_GW=${COMPASS_EXTERNAL_GW:-} export LANGUAGE="EN" -export TIMEZONE="Asia/Shanghai" +export TIMEZONE="America/Los_Angeles" export NTP_SERVER="$COMPASS_SERVER" export NAMESERVERS="$COMPASS_SERVER" + +export COMPASS_DECK="compass4nfv/compass-deck" +export COMPASS_TASKS="compass4nfv/compass-tasks-osa" +export COMPASS_COBBLER="compass4nfv/compass-cobbler" +export COMPASS_DB="compass4nfv/compass-db" +export COMPASS_MQ="compass4nfv/compass-mq" diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-kvm-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-kvm-ha.yml new file mode 100644 index 00000000..9c00916b --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-kvm-ha.yml @@ -0,0 +1,74 @@ +############################################################################## +# 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' + +plugins: + - rt_kvm: "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 + - 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 + - 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 + - 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-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml index 38e20bad..6b329be6 100644 --- a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml @@ -21,7 +21,7 @@ hosts: interfaces: - eth1: 'F8:4A:BF:55:A2:8E' ipmiIp: 172.16.130.26 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -33,7 +33,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:5A:B8' ipmiIp: 172.16.130.27 - ipmiPass: huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -44,7 +44,7 @@ hosts: interfaces: - eth1: '78:D7:52:A0:B1:9A' ipmiIp: 172.16.130.29 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -55,7 +55,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:5B:5E' ipmiIp: 172.16.130.30 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - compute - ceph-osd @@ -65,7 +65,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:56:86' ipmiIp: 172.16.130.31 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml index 0d403bc2..6027bddb 100644 --- a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml @@ -29,7 +29,7 @@ hosts: interfaces: - eth1: 'F8:4A:BF:55:A2:8E' ipmiIp: 172.16.130.26 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -41,7 +41,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:5A:B8' ipmiIp: 172.16.130.27 - ipmiPass: huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -52,7 +52,7 @@ hosts: interfaces: - eth1: '78:D7:52:A0:B1:9A' ipmiIp: 172.16.130.29 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -63,7 +63,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:5B:5E' ipmiIp: 172.16.130.30 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - compute - ceph-osd @@ -73,7 +73,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:56:86' ipmiIp: 172.16.130.31 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml index 3093645f..287383b2 100644 --- a/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml @@ -21,7 +21,7 @@ hosts: interfaces: - eth1: 'F8:4A:BF:55:A2:8E' ipmiIp: 172.16.130.26 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -34,7 +34,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:5A:B8' ipmiIp: 172.16.130.27 - ipmiPass: huawei@123 + ipmiPass: Opnfv@pod1 roles: - compute - ceph-osd @@ -44,7 +44,7 @@ hosts: interfaces: - eth1: '78:D7:52:A0:B1:9A' ipmiIp: 172.16.130.29 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - compute - ceph-osd @@ -54,7 +54,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:5B:5E' ipmiIp: 172.16.130.30 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - compute - ceph-osd @@ -64,7 +64,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:56:86' ipmiIp: 172.16.130.31 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - compute - ceph-osd 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_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml index f7066697..d2447c1d 100644 --- a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml @@ -15,7 +15,9 @@ POWER_TOOL: ipmitool ipmiUser: root ipmiVer: '2.0' -moon: "Enable" +plugins: + - opendaylight: "Enable" + - moon: "Enable" hosts: - name: host1 @@ -23,7 +25,7 @@ hosts: interfaces: - eth1: 'F8:4A:BF:55:A2:8E' ipmiIp: 172.16.130.26 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -36,7 +38,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:5A:B8' ipmiIp: 172.16.130.27 - ipmiPass: huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -48,7 +50,7 @@ hosts: interfaces: - eth1: '78:D7:52:A0:B1:9A' ipmiIp: 172.16.130.29 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -60,7 +62,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:5B:5E' ipmiIp: 172.16.130.30 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - compute - ceph-osd @@ -70,7 +72,6 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:56:86' ipmiIp: 172.16.130.31 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - - compute - - ceph-osd + - moon diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml index 527c1bfb..71edf08c 100644 --- a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml @@ -15,13 +15,16 @@ POWER_TOOL: ipmitool ipmiUser: root ipmiVer: '2.0' +plugins: + - opendaylight: "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: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -34,7 +37,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:5A:B8' ipmiIp: 172.16.130.27 - ipmiPass: huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -46,7 +49,7 @@ hosts: interfaces: - eth1: '78:D7:52:A0:B1:9A' ipmiIp: 172.16.130.29 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -58,7 +61,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:5B:5E' ipmiIp: 172.16.130.30 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - compute - ceph-osd @@ -68,7 +71,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:56:86' ipmiIp: 172.16.130.31 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml index e840380a..2aaf192f 100644 --- a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml @@ -16,6 +16,8 @@ ipmiUser: root ipmiVer: '2.0' odl_l3_agent: "Enable" +plugins: + - opendaylight: "Enable" hosts: - name: host1 @@ -23,7 +25,7 @@ hosts: interfaces: - eth1: 'F8:4A:BF:55:A2:8E' ipmiIp: 172.16.130.26 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -36,7 +38,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:5A:B8' ipmiIp: 172.16.130.27 - ipmiPass: huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -48,7 +50,7 @@ hosts: interfaces: - eth1: '78:D7:52:A0:B1:9A' ipmiIp: 172.16.130.29 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -60,7 +62,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:5B:5E' ipmiIp: 172.16.130.30 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - compute - ceph-osd @@ -70,7 +72,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:56:86' ipmiIp: 172.16.130.31 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml index 1e4f32e2..fb4b1788 100644 --- a/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml @@ -21,7 +21,7 @@ hosts: interfaces: - eth1: 'F8:4A:BF:55:A2:8E' ipmiIp: 172.16.130.26 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -34,7 +34,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:5A:B8' ipmiIp: 172.16.130.27 - ipmiPass: huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -46,7 +46,7 @@ hosts: interfaces: - eth1: '78:D7:52:A0:B1:9A' ipmiIp: 172.16.130.29 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -58,7 +58,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:5B:5E' ipmiIp: 172.16.130.30 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - compute - ceph-osd @@ -68,7 +68,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:56:86' ipmiIp: 172.16.130.31 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml index 221dc0b3..1f40241f 100644 --- a/deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml @@ -23,7 +23,7 @@ hosts: interfaces: - eth1: 'F8:4A:BF:55:A2:8E' ipmiIp: 172.16.130.26 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -36,7 +36,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:5A:B8' ipmiIp: 172.16.130.27 - ipmiPass: huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -48,7 +48,7 @@ hosts: interfaces: - eth1: '78:D7:52:A0:B1:9A' ipmiIp: 172.16.130.29 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - controller - ha @@ -60,7 +60,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:5B:5E' ipmiIp: 172.16.130.30 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - compute - ceph-osd @@ -70,7 +70,7 @@ hosts: interfaces: - eth1: 'D8:49:0B:DA:56:86' ipmiIp: 172.16.130.31 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod1 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-nofeature-ha.yml index 53834c19..5b08ae53 100644 --- a/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-nofeature-ha.yml @@ -19,7 +19,7 @@ hosts: - name: host1 mac: 'EC:38:8F:79:0C:2C' ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 ipmiIp: 172.16.130.20 interfaces: - eth1: 'EC:38:8F:79:0C:2D' @@ -33,7 +33,7 @@ hosts: mac: 'EC:38:8F:79:0C:48' ipmiIp: 172.16.130.19 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:0C:49' roles: @@ -45,7 +45,7 @@ hosts: mac: 'EC:38:8F:79:10:CC' ipmiIp: 172.16.130.18 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:10:CD' roles: @@ -57,7 +57,7 @@ hosts: mac: 'EC:38:8F:79:0C:6C' ipmiIp: 172.16.130.17 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:0C:6D' roles: @@ -68,7 +68,7 @@ hosts: mac: 'EC:38:8F:7A:E6:ED' ipmiIp: 172.16.130.16 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:7A:E6:EE' roles: diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-openo-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-openo-ha.yml index a6dcccfb..18366900 100644 --- a/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-openo-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-openo-ha.yml @@ -27,7 +27,7 @@ hosts: - name: host1 mac: 'EC:38:8F:79:0C:2C' ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 ipmiIp: 172.16.130.20 interfaces: - eth1: 'EC:38:8F:79:0C:2D' @@ -41,7 +41,7 @@ hosts: mac: 'EC:38:8F:79:0C:48' ipmiIp: 172.16.130.19 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:0C:49' roles: @@ -53,7 +53,7 @@ hosts: mac: 'EC:38:8F:79:10:CC' ipmiIp: 172.16.130.18 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:10:CD' roles: @@ -65,7 +65,7 @@ hosts: mac: 'EC:38:8F:79:0C:6C' ipmiIp: 172.16.130.17 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:0C:6D' roles: @@ -76,7 +76,7 @@ hosts: mac: 'EC:38:8F:7A:E6:ED' ipmiIp: 172.16.130.16 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:7A:E6:EE' roles: 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 5fc6716c..e304169e 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 @@ -19,7 +19,7 @@ hosts: - name: host1 mac: 'EC:38:8F:79:0C:2C' ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 ipmiIp: 172.16.130.20 interfaces: - eth1: 'EC:38:8F:79:0C:2D' @@ -34,7 +34,7 @@ hosts: mac: 'EC:38:8F:79:0C:48' ipmiIp: 172.16.130.19 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:0C:49' roles: @@ -45,7 +45,7 @@ hosts: mac: 'EC:38:8F:79:10:CC' ipmiIp: 172.16.130.18 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:10:CD' roles: @@ -56,7 +56,7 @@ hosts: mac: 'EC:38:8F:79:0C:6C' ipmiIp: 172.16.130.17 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:0C:6D' roles: @@ -67,7 +67,7 @@ hosts: mac: 'EC:38:8F:7A:E6:ED' ipmiIp: 172.16.130.16 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:7A:E6:EE' roles: diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-moon-ha.yml index d9d6d837..86da1dfb 100644 --- a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-moon-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-moon-ha.yml @@ -16,12 +16,14 @@ POWER_TOOL: ipmitool ipmiVer: '2.0' moon: "Enable" +plugins: + - opendaylight: "Enable" hosts: - name: host1 mac: 'EC:38:8F:79:0C:2C' ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 ipmiIp: 172.16.130.20 interfaces: - eth1: 'EC:38:8F:79:0C:2D' @@ -36,7 +38,7 @@ hosts: mac: 'EC:38:8F:79:0C:48' ipmiIp: 172.16.130.19 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:0C:49' roles: @@ -50,7 +52,7 @@ hosts: mac: 'EC:38:8F:79:10:CC' ipmiIp: 172.16.130.18 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:10:CD' roles: @@ -64,7 +66,7 @@ hosts: mac: 'EC:38:8F:79:0C:6C' ipmiIp: 172.16.130.17 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:0C:6D' roles: @@ -75,7 +77,7 @@ hosts: mac: 'EC:38:8F:7A:E6:ED' ipmiIp: 172.16.130.16 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:7A:E6:EE' roles: 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 923e1cbd..07e7d0f5 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 @@ -14,12 +14,14 @@ FLAVOR: cluster POWER_TOOL: ipmitool ipmiVer: '2.0' +plugins: + - opendaylight: "Enable" hosts: - name: host1 mac: 'EC:38:8F:79:0C:2C' ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 ipmiIp: 172.16.130.20 interfaces: - eth1: 'EC:38:8F:79:0C:2D' @@ -34,7 +36,7 @@ hosts: mac: 'EC:38:8F:79:0C:48' ipmiIp: 172.16.130.19 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:0C:49' roles: @@ -48,7 +50,7 @@ hosts: mac: 'EC:38:8F:79:10:CC' ipmiIp: 172.16.130.18 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:10:CD' roles: @@ -62,7 +64,7 @@ hosts: mac: 'EC:38:8F:79:0C:6C' ipmiIp: 172.16.130.17 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:0C:6D' roles: @@ -73,7 +75,7 @@ hosts: mac: 'EC:38:8F:7A:E6:ED' ipmiIp: 172.16.130.16 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:7A:E6:EE' roles: diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l3-nofeature-ha.yml index 4502cd1e..5d8ed350 100644 --- a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l3-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l3-nofeature-ha.yml @@ -16,12 +16,14 @@ POWER_TOOL: ipmitool ipmiVer: '2.0' odl_l3_agent: "Enable" +plugins: + - opendaylight: "Enable" hosts: - name: host1 mac: 'EC:38:8F:79:0C:2C' ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 ipmiIp: 172.16.130.20 interfaces: - eth1: 'EC:38:8F:79:0C:2D' @@ -36,7 +38,7 @@ hosts: mac: 'EC:38:8F:79:0C:48' ipmiIp: 172.16.130.19 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:0C:49' roles: @@ -50,7 +52,7 @@ hosts: mac: 'EC:38:8F:79:10:CC' ipmiIp: 172.16.130.18 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:10:CD' roles: @@ -64,7 +66,7 @@ hosts: mac: 'EC:38:8F:79:0C:6C' ipmiIp: 172.16.130.17 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:0C:6D' roles: @@ -75,7 +77,7 @@ hosts: mac: 'EC:38:8F:7A:E6:ED' ipmiIp: 172.16.130.16 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:7A:E6:EE' roles: 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 08753eb2..3770b6ac 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 @@ -19,7 +19,7 @@ hosts: - name: host1 mac: 'EC:38:8F:79:0C:2C' ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 ipmiIp: 172.16.130.20 interfaces: - eth1: 'EC:38:8F:79:0C:2D' @@ -34,7 +34,7 @@ hosts: mac: 'EC:38:8F:79:0C:48' ipmiIp: 172.16.130.19 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:0C:49' roles: @@ -47,7 +47,7 @@ hosts: mac: 'EC:38:8F:79:10:CC' ipmiIp: 172.16.130.18 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:10:CD' roles: @@ -60,7 +60,7 @@ hosts: mac: 'EC:38:8F:79:0C:6C' ipmiIp: 172.16.130.17 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:0C:6D' roles: @@ -71,7 +71,7 @@ hosts: mac: 'EC:38:8F:7A:E6:ED' ipmiIp: 172.16.130.16 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:7A:E6:EE' roles: diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-onos-sfc-ha.yml index 25e984bf..0effc850 100644 --- a/deploy/conf/hardware_environment/huawei-pod2/os-onos-sfc-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod2/os-onos-sfc-ha.yml @@ -21,7 +21,7 @@ hosts: - name: host1 mac: 'EC:38:8F:79:0C:2C' ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 ipmiIp: 172.16.130.20 interfaces: - eth1: 'EC:38:8F:79:0C:2D' @@ -36,7 +36,7 @@ hosts: mac: 'EC:38:8F:79:0C:48' ipmiIp: 172.16.130.19 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:0C:49' roles: @@ -49,7 +49,7 @@ hosts: mac: 'EC:38:8F:79:10:CC' ipmiIp: 172.16.130.18 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:10:CD' roles: @@ -62,7 +62,7 @@ hosts: mac: 'EC:38:8F:79:0C:6C' ipmiIp: 172.16.130.17 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:79:0C:6D' roles: @@ -73,7 +73,7 @@ hosts: mac: 'EC:38:8F:7A:E6:ED' ipmiIp: 172.16.130.16 ipmiUser: root - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod2 interfaces: - eth1: 'EC:38:8F:7A:E6:EE' roles: diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-nosdn-nofeature-ha.yml index deb9c459..632776be 100644 --- a/deploy/conf/hardware_environment/huawei-pod4/os-nosdn-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod4/os-nosdn-nofeature-ha.yml @@ -21,7 +21,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BA:63:4A' ipmiIp: 172.16.131.17 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -33,7 +33,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AA:C6' ipmiIp: 172.16.131.18 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -44,7 +44,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:B9:1F:4A' ipmiIp: 172.16.131.19 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -55,7 +55,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AA:EA' ipmiIp: 172.16.131.20 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - compute - ceph-osd @@ -65,7 +65,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AB:1E' ipmiIp: 172.16.131.21 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-ocl-nofeature-ha.yml index a86a1cf4..efe9ace7 100644 --- a/deploy/conf/hardware_environment/huawei-pod4/os-ocl-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod4/os-ocl-nofeature-ha.yml @@ -21,7 +21,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BA:63:4A' ipmiIp: 172.16.131.17 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -34,7 +34,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AA:C6' ipmiIp: 172.16.131.18 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - compute - ceph-osd @@ -44,7 +44,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:B9:1F:4A' ipmiIp: 172.16.131.19 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - compute - ceph-osd @@ -54,7 +54,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AA:EA' ipmiIp: 172.16.131.20 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - compute - ceph-osd @@ -64,7 +64,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AB:1E' ipmiIp: 172.16.131.21 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-moon-ha.yml index 5a37257e..fa034d30 100644 --- a/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-moon-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-moon-ha.yml @@ -23,7 +23,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BA:63:4A' ipmiIp: 172.16.131.17 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -36,7 +36,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AA:C6' ipmiIp: 172.16.131.18 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -48,7 +48,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:B9:1F:4A' ipmiIp: 172.16.131.19 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -60,7 +60,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AA:EA' ipmiIp: 172.16.131.20 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - compute - ceph-osd @@ -70,7 +70,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AB:1E' ipmiIp: 172.16.131.21 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-nofeature-ha.yml index 80097b78..05543930 100644 --- a/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-nofeature-ha.yml @@ -21,7 +21,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BA:63:4A' ipmiIp: 172.16.131.17 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -34,7 +34,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AA:C6' ipmiIp: 172.16.131.18 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -46,7 +46,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:B9:1F:4A' ipmiIp: 172.16.131.19 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -58,7 +58,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AA:EA' ipmiIp: 172.16.131.20 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - compute - ceph-osd @@ -68,7 +68,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AB:1E' ipmiIp: 172.16.131.21 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-odl_l3-nofeature-ha.yml index 4d4c715f..46f7e791 100644 --- a/deploy/conf/hardware_environment/huawei-pod4/os-odl_l3-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod4/os-odl_l3-nofeature-ha.yml @@ -23,7 +23,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BA:63:4A' ipmiIp: 172.16.131.17 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -36,7 +36,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AA:C6' ipmiIp: 172.16.131.18 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -48,7 +48,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:B9:1F:4A' ipmiIp: 172.16.131.19 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -60,7 +60,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AA:EA' ipmiIp: 172.16.131.20 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - compute - ceph-osd @@ -70,7 +70,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AB:1E' ipmiIp: 172.16.131.21 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-onos-nofeature-ha.yml index 01dd3a80..73068b50 100644 --- a/deploy/conf/hardware_environment/huawei-pod4/os-onos-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod4/os-onos-nofeature-ha.yml @@ -21,7 +21,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BA:63:4A' ipmiIp: 172.16.131.17 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -34,7 +34,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AA:C6' ipmiIp: 172.16.131.18 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -46,7 +46,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:B9:1F:4A' ipmiIp: 172.16.131.19 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -58,7 +58,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AA:EA' ipmiIp: 172.16.131.20 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - compute - ceph-osd @@ -68,7 +68,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AB:1E' ipmiIp: 172.16.131.21 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod4/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod4/os-onos-sfc-ha.yml index 01dd3a80..73068b50 100644 --- a/deploy/conf/hardware_environment/huawei-pod4/os-onos-sfc-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod4/os-onos-sfc-ha.yml @@ -21,7 +21,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BA:63:4A' ipmiIp: 172.16.131.17 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -34,7 +34,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AA:C6' ipmiIp: 172.16.131.18 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -46,7 +46,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:B9:1F:4A' ipmiIp: 172.16.131.19 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - controller - ha @@ -58,7 +58,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AA:EA' ipmiIp: 172.16.131.20 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - compute - ceph-osd @@ -68,7 +68,7 @@ hosts: interfaces: - eth1: 'E8:4D:D0:BB:AB:1E' ipmiIp: 172.16.131.21 - ipmiPass: Huawei@123 + ipmiPass: Opnfv@pod4 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml index b0fa1804..acf996d0 100644 --- a/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml @@ -21,7 +21,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:67:8B' ipmiIp: 192.168.5.173 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -33,7 +33,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:5A:D0' ipmiIp: 192.168.5.174 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -44,7 +44,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:67:55' ipmiIp: 192.168.5.175 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -55,7 +55,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:5D:4C' ipmiIp: 192.168.5.176 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - compute - ceph-osd @@ -65,7 +65,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:63:31' ipmiIp: 192.168.5.177 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml index dd5158e5..6e486b57 100644 --- a/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml @@ -21,7 +21,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:67:8B' ipmiIp: 192.168.5.173 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -34,7 +34,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:5A:D0' ipmiIp: 192.168.5.174 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - compute - ceph-osd @@ -44,7 +44,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:67:55' ipmiIp: 192.168.5.175 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - compute - ceph-osd @@ -54,7 +54,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:5D:4C' ipmiIp: 192.168.5.176 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - compute - ceph-osd @@ -64,7 +64,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:63:31' ipmiIp: 192.168.5.177 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml index defafed9..9829885f 100644 --- a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml @@ -23,7 +23,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:67:8B' ipmiIp: 192.168.5.173 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -36,7 +36,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:5A:D0' ipmiIp: 192.168.5.174 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -48,7 +48,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:67:55' ipmiIp: 192.168.5.175 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -60,7 +60,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:5D:4C' ipmiIp: 192.168.5.176 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - compute - ceph-osd @@ -70,7 +70,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:63:31' ipmiIp: 192.168.5.177 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml index 24e7f516..58c8edcb 100644 --- a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml @@ -21,7 +21,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:67:8B' ipmiIp: 192.168.5.173 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -34,7 +34,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:5A:D0' ipmiIp: 192.168.5.174 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -46,7 +46,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:67:55' ipmiIp: 192.168.5.175 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -58,7 +58,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:5D:4C' ipmiIp: 192.168.5.176 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - compute - ceph-osd @@ -68,7 +68,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:63:31' ipmiIp: 192.168.5.177 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml index 2b000e82..921fe81b 100644 --- a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml @@ -23,7 +23,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:67:8B' ipmiIp: 192.168.5.173 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -36,7 +36,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:5A:D0' ipmiIp: 192.168.5.174 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -48,7 +48,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:67:55' ipmiIp: 192.168.5.175 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -60,7 +60,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:5D:4C' ipmiIp: 192.168.5.176 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - compute - ceph-osd @@ -70,7 +70,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:63:31' ipmiIp: 192.168.5.177 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml index 70dd9d5d..59e94527 100644 --- a/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml @@ -21,7 +21,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:67:8B' ipmiIp: 192.168.5.173 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -34,7 +34,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:5A:D0' ipmiIp: 192.168.5.174 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -46,7 +46,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:67:55' ipmiIp: 192.168.5.175 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -58,7 +58,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:5D:4C' ipmiIp: 192.168.5.176 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - compute - ceph-osd @@ -68,7 +68,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:63:31' ipmiIp: 192.168.5.177 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml index c47814c1..f81b9d21 100644 --- a/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml @@ -23,7 +23,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:67:8B' ipmiIp: 192.168.5.173 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -36,7 +36,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:5A:D0' ipmiIp: 192.168.5.174 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -48,7 +48,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:67:55' ipmiIp: 192.168.5.175 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - controller - ha @@ -60,7 +60,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:5D:4C' ipmiIp: 192.168.5.176 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - compute - ceph-osd @@ -70,7 +70,7 @@ hosts: interfaces: - eth1: 'E0:97:96:10:63:31' ipmiIp: 192.168.5.177 - ipmiPass: Huawei12#$ + ipmiPass: Opnfv@pod5 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod6/network.yml b/deploy/conf/hardware_environment/huawei-pod6/network.yml new file mode 100644 index 00000000..f6deed4b --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod6/network.yml @@ -0,0 +1,100 @@ +############################################################################## +# 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 +############################################################################## + +--- +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 101 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 102 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.16.1.1" + - "172.16.1.254" + cidr: "172.16.1.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.16.2.1" + - "172.16.2.254" + cidr: "172.16.2.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "192.168.10.10" + - "192.168.10.50" + cidr: "192.168.10.0/24" + gw: "192.168.10.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.168.10.51 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: "True" + network: ext-net + type: flat + segment_id: 10 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: "False" + no_gateway: "False" + external_gw: "192.168.10.1" + floating_ip_cidr: "192.168.10.0/24" + floating_ip_start: "192.168.10.100" + floating_ip_end: "192.168.10.200" diff --git a/deploy/conf/hardware_environment/huawei-pod6/network_ocl.yml b/deploy/conf/hardware_environment/huawei-pod6/network_ocl.yml new file mode 100644 index 00000000..97c4e3c5 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod6/network_ocl.yml @@ -0,0 +1,100 @@ +############################################################################## +# 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 +############################################################################## + +--- +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 101 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 102 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.16.1.1" + - "172.16.1.254" + cidr: "172.16.1.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.16.2.1" + - "172.16.2.254" + cidr: "172.16.2.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "192.168.10.10" + - "192.168.10.50" + cidr: "192.168.10.0/24" + gw: "192.168.10.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.168.10.51 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: "True" + network: ext-net + type: flat + segment_id: 10 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: "False" + no_gateway: "False" + external_gw: "100.100.100.1" + floating_ip_cidr: "100.100.100.0/24" + floating_ip_start: "100.100.100.30" + floating_ip_end: "100.100.100.120" diff --git a/deploy/conf/hardware_environment/huawei-pod6/network_onos.yml b/deploy/conf/hardware_environment/huawei-pod6/network_onos.yml new file mode 100644 index 00000000..19fc95eb --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod6/network_onos.yml @@ -0,0 +1,100 @@ +############################################################################## +# 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 +############################################################################## + +--- +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 101 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 102 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.16.1.1" + - "172.16.1.254" + cidr: "172.16.1.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.16.2.1" + - "172.16.2.254" + cidr: "172.16.2.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "192.168.10.10" + - "192.168.10.50" + cidr: "192.168.10.0/24" + gw: "192.168.10.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.168.10.51 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: "True" + network: ext-net + type: vxlan + segment_id: 10 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: "False" + no_gateway: "False" + external_gw: "192.168.10.1" + floating_ip_cidr: "192.168.10.0/24" + floating_ip_start: "192.168.10.100" + floating_ip_end: "192.168.10.200" diff --git a/deploy/conf/hardware_environment/huawei-pod6/network_openo.yml b/deploy/conf/hardware_environment/huawei-pod6/network_openo.yml new file mode 100644 index 00000000..6fc5bc45 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod6/network_openo.yml @@ -0,0 +1,105 @@ +############################################################################## +# Copyright (c) 2017 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 +############################################################################## + +--- +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 101 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 102 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.16.1.1" + - "172.16.1.254" + cidr: "172.16.1.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.16.2.1" + - "172.16.2.254" + cidr: "172.16.2.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "192.168.10.10" + - "192.168.10.50" + cidr: "192.168.10.0/24" + gw: "192.168.10.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.168.10.51 + netmask: "24" + interface: external + +openo_net: + openo_ip: 192.168.10.50 + openo_docker_gw: 172.11.1.1 + openo_docker_cidr: 172.11.1.0/24 + +onos_nic: eth2 +public_net_info: + enable: "True" + network: ext-net + type: flat + segment_id: 10 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: "False" + no_gateway: "False" + external_gw: "192.168.10.1" + floating_ip_cidr: "192.168.10.0/24" + floating_ip_start: "192.168.10.100" + floating_ip_end: "192.168.10.200" diff --git a/deploy/conf/hardware_environment/huawei-pod6/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod6/os-nosdn-nofeature-ha.yml new file mode 100644 index 00000000..4e882227 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod6/os-nosdn-nofeature-ha.yml @@ -0,0 +1,71 @@ +############################################################################## +# 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' + +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@pod6 + roles: + - controller + - ha + - 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@pod6 + roles: + - controller + - ha + - 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@pod6 + roles: + - controller + - ha + - 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@pod6 + 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@pod6 + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod6/os-nosdn-openo-ha.yml b/deploy/conf/hardware_environment/huawei-pod6/os-nosdn-openo-ha.yml new file mode 100644 index 00000000..715bb131 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod6/os-nosdn-openo-ha.yml @@ -0,0 +1,79 @@ +############################################################################## +# Copyright (c) 2017 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' + +deploy_options: + orchestrator: + type: open-o + version: 1.0.0 + + vnf: + type: + +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@pod6 + roles: + - controller + - ha + - 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@pod6 + roles: + - controller + - ha + - 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@pod6 + roles: + - controller + - ha + - 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@pod6 + 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@pod6 + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod6/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod6/os-ocl-nofeature-ha.yml new file mode 100644 index 00000000..d0faeeda --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod6/os-ocl-nofeature-ha.yml @@ -0,0 +1,70 @@ +############################################################################## +# 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' + +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@pod6 + roles: + - controller + - ha + - opencontrail + - 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@pod6 + roles: + - compute + - ceph-osd + + - name: host3 + mac: '78:D7:52:A0:B1:99' + interfaces: + - eth1: '78:D7:52:A0:B1:9A' + ipmiIp: 172.16.130.29 + ipmiPass: Opnfv@pod6 + roles: + - compute + - ceph-osd + + - name: host4 + mac: 'D8:49:0B:DA:5B:5D' + interfaces: + - eth1: 'D8:49:0B:DA:5B:5E' + ipmiIp: 172.16.130.30 + ipmiPass: Opnfv@pod6 + 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@pod6 + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod6/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod6/os-odl_l2-moon-ha.yml new file mode 100644 index 00000000..005e29c6 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod6/os-odl_l2-moon-ha.yml @@ -0,0 +1,76 @@ +############################################################################## +# 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' + +moon: "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@pod6 + 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@pod6 + 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@pod6 + 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@pod6 + 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@pod6 + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod6/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod6/os-odl_l2-nofeature-ha.yml new file mode 100644 index 00000000..bba97fdd --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod6/os-odl_l2-nofeature-ha.yml @@ -0,0 +1,74 @@ +############################################################################## +# 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' + +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@pod6 + 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@pod6 + 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@pod6 + 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@pod6 + 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@pod6 + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod6/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod6/os-odl_l3-nofeature-ha.yml new file mode 100644 index 00000000..8710d420 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod6/os-odl_l3-nofeature-ha.yml @@ -0,0 +1,76 @@ +############################################################################## +# 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" + +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@pod6 + 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@pod6 + 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@pod6 + 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@pod6 + 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@pod6 + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod6/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod6/os-onos-nofeature-ha.yml new file mode 100644 index 00000000..7b318d63 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod6/os-onos-nofeature-ha.yml @@ -0,0 +1,74 @@ +############################################################################## +# 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' + +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@pod6 + roles: + - controller + - ha + - onos + - 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@pod6 + roles: + - controller + - ha + - onos + - 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@pod6 + roles: + - controller + - ha + - onos + - 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@pod6 + 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@pod6 + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/huawei-pod6/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod6/os-onos-sfc-ha.yml new file mode 100644 index 00000000..9908ec84 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod6/os-onos-sfc-ha.yml @@ -0,0 +1,76 @@ +############################################################################## +# 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' + +onos_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@pod6 + roles: + - controller + - ha + - onos + - 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@pod6 + roles: + - controller + - ha + - onos + - 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@pod6 + roles: + - controller + - ha + - onos + - 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@pod6 + 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@pod6 + roles: + - compute + - ceph-osd diff --git a/deploy/conf/virtual.conf b/deploy/conf/virtual.conf index 7f4fcf02..1e9034f3 100644 --- a/deploy/conf/virtual.conf +++ b/deploy/conf/virtual.conf @@ -1,9 +1,9 @@ export VIRT_NUMBER=${VIRT_NUMBER:-5} -export VIRT_CPUS=${VIRT_CPU:-4} +export VIRT_CPUS=${VIRT_CPUS:-8} export VIRT_MEM=${VIRT_MEM:-16384} export VIRT_DISK=${VIRT_DISK:-200G} export SWITCH_IPS="1.1.1.1" export SWITCH_CREDENTIAL="version=2c,community=public" -export DEPLOYMENT_TIMEOUT="150" +export DEPLOYMENT_TIMEOUT="300" export POLL_SWITCHES_FLAG="nopoll_switches" diff --git a/deploy/conf/vm_environment/huawei-virtual1/network.yml b/deploy/conf/vm_environment/huawei-virtual1/network.yml index 5c2b0257..ab485a8d 100644 --- a/deploy/conf/vm_environment/huawei-virtual1/network.yml +++ b/deploy/conf/vm_environment/huawei-virtual1/network.yml @@ -65,10 +65,10 @@ ip_settings: - name: external ip_ranges: - - - "192.168.107.210" - - "192.168.107.220" - cidr: "192.168.107.0/24" - gw: "192.168.107.1" + - - "192.16.1.210" + - "192.16.1.220" + cidr: "192.16.1.0/24" + gw: "192.16.1.1" role: - controller - compute @@ -79,7 +79,7 @@ internal_vip: interface: mgmt public_vip: - ip: 192.168.107.222 + ip: 192.16.1.222 netmask: "24" interface: external @@ -94,7 +94,7 @@ public_net_info: router: router-ext enable_dhcp: "False" no_gateway: "False" - external_gw: "192.168.107.1" - floating_ip_cidr: "192.168.107.0/24" - floating_ip_start: "192.168.107.101" - floating_ip_end: "192.168.107.199" + external_gw: "192.16.1.1" + floating_ip_cidr: "192.16.1.0/24" + floating_ip_start: "192.16.1.101" + floating_ip_end: "192.16.1.199" diff --git a/deploy/conf/vm_environment/huawei-virtual1/network_openo.yml b/deploy/conf/vm_environment/huawei-virtual1/network_openo.yml index a31c2990..e0663439 100644 --- a/deploy/conf/vm_environment/huawei-virtual1/network_openo.yml +++ b/deploy/conf/vm_environment/huawei-virtual1/network_openo.yml @@ -65,10 +65,10 @@ ip_settings: - name: external ip_ranges: - - - "192.168.107.210" - - "192.168.107.220" - cidr: "192.168.107.0/24" - gw: "192.168.107.1" + - - "192.16.1.210" + - "192.16.1.220" + cidr: "192.16.1.0/24" + gw: "192.16.1.1" role: - controller - compute @@ -79,12 +79,12 @@ internal_vip: interface: mgmt public_vip: - ip: 192.168.107.222 + ip: 192.16.1.222 netmask: "24" interface: external openo_net: - openo_ip: 192.168.107.50 + openo_ip: 192.16.1.50 openo_docker_gw: 172.11.1.1 openo_docker_cidr: 172.11.1.0/24 @@ -99,7 +99,7 @@ public_net_info: router: router-ext enable_dhcp: "False" no_gateway: "False" - external_gw: "192.168.107.1" - floating_ip_cidr: "192.168.107.0/24" - floating_ip_start: "192.168.107.101" - floating_ip_end: "192.168.107.199" + external_gw: "192.16.1.1" + floating_ip_cidr: "192.16.1.0/24" + floating_ip_start: "192.16.1.101" + floating_ip_end: "192.16.1.199" diff --git a/deploy/conf/vm_environment/huawei-virtual2/network.yml b/deploy/conf/vm_environment/huawei-virtual2/network.yml index b869dd45..ab485a8d 100644 --- a/deploy/conf/vm_environment/huawei-virtual2/network.yml +++ b/deploy/conf/vm_environment/huawei-virtual2/network.yml @@ -65,10 +65,10 @@ ip_settings: - name: external ip_ranges: - - - "192.168.106.210" - - "192.168.106.220" - cidr: "192.168.106.0/24" - gw: "192.168.106.1" + - - "192.16.1.210" + - "192.16.1.220" + cidr: "192.16.1.0/24" + gw: "192.16.1.1" role: - controller - compute @@ -79,7 +79,7 @@ internal_vip: interface: mgmt public_vip: - ip: 192.168.106.222 + ip: 192.16.1.222 netmask: "24" interface: external @@ -94,7 +94,7 @@ public_net_info: router: router-ext enable_dhcp: "False" no_gateway: "False" - external_gw: "192.168.106.1" - floating_ip_cidr: "192.168.106.0/24" - floating_ip_start: "192.168.106.101" - floating_ip_end: "192.168.106.199" + external_gw: "192.16.1.1" + floating_ip_cidr: "192.16.1.0/24" + floating_ip_start: "192.16.1.101" + floating_ip_end: "192.16.1.199" diff --git a/deploy/conf/vm_environment/huawei-virtual2/network_openo.yml b/deploy/conf/vm_environment/huawei-virtual2/network_openo.yml index 98b3a83d..e0663439 100644 --- a/deploy/conf/vm_environment/huawei-virtual2/network_openo.yml +++ b/deploy/conf/vm_environment/huawei-virtual2/network_openo.yml @@ -65,10 +65,10 @@ ip_settings: - name: external ip_ranges: - - - "192.168.106.210" - - "192.168.106.220" - cidr: "192.168.106.0/24" - gw: "192.168.106.1" + - - "192.16.1.210" + - "192.16.1.220" + cidr: "192.16.1.0/24" + gw: "192.16.1.1" role: - controller - compute @@ -79,12 +79,12 @@ internal_vip: interface: mgmt public_vip: - ip: 192.168.106.222 + ip: 192.16.1.222 netmask: "24" interface: external openo_net: - openo_ip: 192.168.106.50 + openo_ip: 192.16.1.50 openo_docker_gw: 172.11.1.1 openo_docker_cidr: 172.11.1.0/24 @@ -99,7 +99,7 @@ public_net_info: router: router-ext enable_dhcp: "False" no_gateway: "False" - external_gw: "192.168.106.1" - floating_ip_cidr: "192.168.106.0/24" - floating_ip_start: "192.168.106.101" - floating_ip_end: "192.168.106.199" + external_gw: "192.16.1.1" + floating_ip_cidr: "192.16.1.0/24" + floating_ip_start: "192.16.1.101" + floating_ip_end: "192.16.1.199" diff --git a/deploy/conf/vm_environment/huawei-virtual5/network.yml b/deploy/conf/vm_environment/huawei-virtual5/network.yml new file mode 100644 index 00000000..ab485a8d --- /dev/null +++ b/deploy/conf/vm_environment/huawei-virtual5/network.yml @@ -0,0 +1,100 @@ +############################################################################## +# 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 +############################################################################## + +--- +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 101 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 102 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.16.1.1" + - "172.16.1.254" + cidr: "172.16.1.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.16.2.1" + - "172.16.2.254" + cidr: "172.16.2.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "192.16.1.210" + - "192.16.1.220" + cidr: "192.16.1.0/24" + gw: "192.16.1.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.16.1.222 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: "True" + network: ext-net + type: flat + segment_id: 1000 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: "False" + no_gateway: "False" + external_gw: "192.16.1.1" + floating_ip_cidr: "192.16.1.0/24" + floating_ip_start: "192.16.1.101" + floating_ip_end: "192.16.1.199" diff --git a/deploy/conf/vm_environment/huawei-virtual5/network_ocl.yml b/deploy/conf/vm_environment/huawei-virtual5/network_ocl.yml new file mode 100644 index 00000000..b5a57103 --- /dev/null +++ b/deploy/conf/vm_environment/huawei-virtual5/network_ocl.yml @@ -0,0 +1,100 @@ +############################################################################## +# 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 +############################################################################## + +--- +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 101 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 102 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.16.1.1" + - "172.16.1.254" + cidr: "172.16.1.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.16.2.1" + - "172.16.2.254" + cidr: "172.16.2.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "192.168.107.210" + - "192.168.107.220" + cidr: "192.168.107.0/24" + gw: "192.168.107.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.168.107.222 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: "True" + network: ext-net + type: flat + segment_id: 1000 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: "False" + no_gateway: "False" + external_gw: "100.100.100.1" + floating_ip_cidr: "100.100.100.0/24" + floating_ip_start: "100.100.100.30" + floating_ip_end: "100.100.100.120" diff --git a/deploy/conf/vm_environment/huawei-virtual5/network_onos.yml b/deploy/conf/vm_environment/huawei-virtual5/network_onos.yml new file mode 100644 index 00000000..ce5353eb --- /dev/null +++ b/deploy/conf/vm_environment/huawei-virtual5/network_onos.yml @@ -0,0 +1,100 @@ +############################################################################## +# 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 +############################################################################## + +--- +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 101 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 102 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.16.1.1" + - "172.16.1.254" + cidr: "172.16.1.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.16.2.1" + - "172.16.2.254" + cidr: "172.16.2.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "192.168.107.210" + - "192.168.107.220" + cidr: "192.168.107.0/24" + gw: "192.168.107.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.168.107.222 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: "True" + network: ext-net + type: vxlan + segment_id: 1000 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: "False" + no_gateway: "False" + external_gw: "192.168.107.1" + floating_ip_cidr: "192.168.107.0/24" + floating_ip_start: "192.168.107.101" + floating_ip_end: "192.168.107.199" diff --git a/deploy/conf/vm_environment/huawei-virtual5/network_openo.yml b/deploy/conf/vm_environment/huawei-virtual5/network_openo.yml new file mode 100644 index 00000000..e0663439 --- /dev/null +++ b/deploy/conf/vm_environment/huawei-virtual5/network_openo.yml @@ -0,0 +1,105 @@ +############################################################################## +# Copyright (c) 2017 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 +############################################################################## + +--- +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 101 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 102 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.16.1.1" + - "172.16.1.254" + cidr: "172.16.1.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.16.2.1" + - "172.16.2.254" + cidr: "172.16.2.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "192.16.1.210" + - "192.16.1.220" + cidr: "192.16.1.0/24" + gw: "192.16.1.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.16.1.222 + netmask: "24" + interface: external + +openo_net: + openo_ip: 192.16.1.50 + openo_docker_gw: 172.11.1.1 + openo_docker_cidr: 172.11.1.0/24 + +onos_nic: eth2 +public_net_info: + enable: "True" + network: ext-net + type: flat + segment_id: 1000 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: "False" + no_gateway: "False" + external_gw: "192.16.1.1" + floating_ip_cidr: "192.16.1.0/24" + floating_ip_start: "192.16.1.101" + floating_ip_end: "192.16.1.199" diff --git a/deploy/conf/vm_environment/network.yml b/deploy/conf/vm_environment/network.yml new file mode 100644 index 00000000..ab485a8d --- /dev/null +++ b/deploy/conf/vm_environment/network.yml @@ -0,0 +1,100 @@ +############################################################################## +# 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 +############################################################################## + +--- +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 101 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 102 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.16.1.1" + - "172.16.1.254" + cidr: "172.16.1.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.16.2.1" + - "172.16.2.254" + cidr: "172.16.2.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "192.16.1.210" + - "192.16.1.220" + cidr: "192.16.1.0/24" + gw: "192.16.1.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 192.16.1.222 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: "True" + network: ext-net + type: flat + segment_id: 1000 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: "False" + no_gateway: "False" + external_gw: "192.16.1.1" + floating_ip_cidr: "192.16.1.0/24" + floating_ip_start: "192.16.1.101" + floating_ip_end: "192.16.1.199" diff --git a/deploy/conf/vm_environment/os-nosdn-kvm-ha.yml b/deploy/conf/vm_environment/os-nosdn-kvm-ha.yml new file mode 100644 index 00000000..fd2ede2f --- /dev/null +++ b/deploy/conf/vm_environment/os-nosdn-kvm-ha.yml @@ -0,0 +1,45 @@ +############################################################################## +# 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 + +plugins: + - rt_kvm: "Enable" + +hosts: + - name: host1 + roles: + - controller + - ha + - ceph-adm + - ceph-mon + + - name: host2 + roles: + - controller + - ha + - ceph-mon + + - name: host3 + roles: + - controller + - ha + - ceph-mon + + - name: host4 + roles: + - compute + - ceph-osd + + - name: host5 + 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_l2-moon-ha.yml b/deploy/conf/vm_environment/os-odl_l2-moon-ha.yml index ffb9fa14..5a02cbf7 100644 --- a/deploy/conf/vm_environment/os-odl_l2-moon-ha.yml +++ b/deploy/conf/vm_environment/os-odl_l2-moon-ha.yml @@ -11,7 +11,9 @@ TYPE: virtual FLAVOR: cluster -moon: "Enable" +plugins: + - opendaylight: "Enable" + - moon: "Enable" hosts: - name: host1 @@ -43,5 +45,4 @@ hosts: - name: host5 roles: - - compute - - ceph-osd + - moon diff --git a/deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml b/deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml index 042367e6..4296ffda 100644 --- a/deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml +++ b/deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml @@ -11,6 +11,9 @@ TYPE: virtual FLAVOR: cluster +plugins: + - opendaylight: "Enable" + hosts: - name: host1 roles: diff --git a/deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml b/deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml index 10a27ebd..fb530012 100644 --- a/deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml +++ b/deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml @@ -12,6 +12,8 @@ TYPE: virtual FLAVOR: cluster odl_l3_agent: "Enable" +plugins: + - opendaylight: "Enable" hosts: - name: host1 |