summaryrefslogtreecommitdiffstats
path: root/deploy/conf
diff options
context:
space:
mode:
authorliyuenan <liyuenan@huawei.com>2016-12-27 17:44:34 +0800
committerliyuenan <liyuenan@huawei.com>2017-01-05 09:42:35 +0800
commit92f6ca7bb6d7b2f295406aab34094b1dba76ff94 (patch)
treec4e62927a3bf9862f7ba9ce286cbece2c4335ef4 /deploy/conf
parent6072a49adb33f2bce3f48b9c7b8be7d96cf8501c (diff)
Yamllint test
JIRA: COMPASS-516 Change-Id: I482ce9bc86f4f963258c5b8823e0b00e83556eef Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/conf')
-rw-r--r--deploy/conf/hardware_environment/expansion-sample/hardware_cluster_expansion.yml14
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/network.yml19
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/network_ocl.yml19
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/network_onos.yml19
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml5
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml5
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml5
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml5
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml5
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml5
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml5
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/network.yml23
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/network_ocl.yml23
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/network_onos.yml19
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-nosdn-nofeature-ha.yml1
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml1
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-moon-ha.yml1
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-nofeature-ha.yml1
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-odl_l3-nofeature-ha.yml1
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml1
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-onos-sfc-ha.yml1
-rw-r--r--deploy/conf/hardware_environment/huawei-pod4/network.yml20
-rw-r--r--deploy/conf/hardware_environment/huawei-pod4/network_ocl.yml20
-rw-r--r--deploy/conf/hardware_environment/huawei-pod4/network_onos.yml20
-rw-r--r--deploy/conf/hardware_environment/huawei-pod4/os-nosdn-nofeature-ha.yml4
-rw-r--r--deploy/conf/hardware_environment/huawei-pod4/os-ocl-nofeature-ha.yml4
-rw-r--r--deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-moon-ha.yml4
-rw-r--r--deploy/conf/hardware_environment/huawei-pod4/os-odl_l2-nofeature-ha.yml4
-rw-r--r--deploy/conf/hardware_environment/huawei-pod4/os-odl_l3-nofeature-ha.yml4
-rw-r--r--deploy/conf/hardware_environment/huawei-pod4/os-onos-nofeature-ha.yml4
-rw-r--r--deploy/conf/hardware_environment/huawei-pod4/os-onos-sfc-ha.yml4
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/network.yml19
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml19
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/network_onos.yml19
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml6
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml5
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml6
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml6
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml6
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml6
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml5
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/network.yml19
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/network_ocl.yml19
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/network_onos.yml19
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml3
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml2
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml3
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml3
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml3
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml3
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml3
-rw-r--r--deploy/conf/network_cfg.yaml19
-rw-r--r--deploy/conf/network_cfg_ocl.yaml19
-rw-r--r--deploy/conf/network_cfg_onos.yaml19
-rw-r--r--deploy/conf/neutron_cfg.yaml1
-rw-r--r--deploy/conf/vm_environment/huawei-virtual1/network.yml19
-rw-r--r--deploy/conf/vm_environment/huawei-virtual1/network_ocl.yml19
-rw-r--r--deploy/conf/vm_environment/huawei-virtual1/network_onos.yml19
-rw-r--r--deploy/conf/vm_environment/huawei-virtual2/network.yml19
-rw-r--r--deploy/conf/vm_environment/huawei-virtual2/network_ocl.yml19
-rw-r--r--deploy/conf/vm_environment/huawei-virtual2/network_onos.yml19
-rw-r--r--deploy/conf/vm_environment/huawei-virtual3/network.yml19
-rw-r--r--deploy/conf/vm_environment/huawei-virtual3/network_ocl.yml19
-rw-r--r--deploy/conf/vm_environment/huawei-virtual3/network_onos.yml19
-rw-r--r--deploy/conf/vm_environment/huawei-virtual4/network.yml19
-rw-r--r--deploy/conf/vm_environment/huawei-virtual4/network_ocl.yml19
-rw-r--r--deploy/conf/vm_environment/huawei-virtual4/network_onos.yml19
-rw-r--r--deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml1
-rw-r--r--deploy/conf/vm_environment/os-ocl-nofeature-ha.yml1
-rw-r--r--deploy/conf/vm_environment/os-odl_l2-moon-ha.yml1
-rw-r--r--deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml1
-rw-r--r--deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml1
-rw-r--r--deploy/conf/vm_environment/os-onos-nofeature-ha.yml1
-rw-r--r--deploy/conf/vm_environment/os-onos-sfc-ha.yml1
-rw-r--r--deploy/conf/vm_environment/virtual_cluster_expansion.yml2
75 files changed, 378 insertions, 357 deletions
diff --git a/deploy/conf/hardware_environment/expansion-sample/hardware_cluster_expansion.yml b/deploy/conf/hardware_environment/expansion-sample/hardware_cluster_expansion.yml
index b160b32a..931d4c8d 100644
--- a/deploy/conf/hardware_environment/expansion-sample/hardware_cluster_expansion.yml
+++ b/deploy/conf/hardware_environment/expansion-sample/hardware_cluster_expansion.yml
@@ -1,3 +1,4 @@
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -7,9 +8,10 @@ ipmiPass: Huawei@123
hosts:
- name: host6
- mac: 'E8:4D:D0:BA:60:45'
- interfaces:
- - eth1: '08:4D:D0:BA:60:44'
- ipmiIp: 172.16.131.23
- roles:
- - compute
+ mac: 'E8:4D:D0:BA:60:45'
+ interfaces:
+ - eth1: '08:4D:D0:BA:60:44'
+ ipmiIp: 172.16.131.23
+ roles:
+ - compute
+ - ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod1/network.yml b/deploy/conf/hardware_environment/huawei-pod1/network.yml
index 154f4150..9d582347 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/network.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/network.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.10.10"
- - "192.168.10.50"
+ - - "192.168.10.10"
+ - "192.168.10.50"
cidr: "192.168.10.0/24"
gw: "192.168.10.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ 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"
diff --git a/deploy/conf/hardware_environment/huawei-pod1/network_ocl.yml b/deploy/conf/hardware_environment/huawei-pod1/network_ocl.yml
index 78dafd99..d9129a10 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/network_ocl.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/network_ocl.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.10.10"
- - "192.168.10.50"
+ - - "192.168.10.10"
+ - "192.168.10.50"
cidr: "192.168.10.0/24"
gw: "192.168.10.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ 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"
diff --git a/deploy/conf/hardware_environment/huawei-pod1/network_onos.yml b/deploy/conf/hardware_environment/huawei-pod1/network_onos.yml
index 1353ed40..13566b47 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/network_onos.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/network_onos.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.10.10"
- - "192.168.10.50"
+ - - "192.168.10.10"
+ - "192.168.10.50"
cidr: "192.168.10.0/24"
gw: "192.168.10.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ 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"
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 8d5794f7..66e1cc20 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -10,7 +10,7 @@ hosts:
- name: host1
mac: 'F8:4A:BF:55:A2:8D'
interfaces:
- - eth1: 'F8:4A:BF:55:A2:8E'
+ - eth1: 'F8:4A:BF:55:A2:8E'
ipmiIp: 172.16.130.26
ipmiPass: Huawei@123
roles:
@@ -60,4 +60,3 @@ hosts:
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 bd10dc6d..7f54fd47 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -10,7 +10,7 @@ hosts:
- name: host1
mac: 'F8:4A:BF:55:A2:8D'
interfaces:
- - eth1: 'F8:4A:BF:55:A2:8E'
+ - eth1: 'F8:4A:BF:55:A2:8E'
ipmiIp: 172.16.130.26
ipmiPass: Huawei@123
roles:
@@ -59,4 +59,3 @@ hosts:
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 2286bc6a..11dd076a 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -12,7 +12,7 @@ hosts:
- name: host1
mac: 'F8:4A:BF:55:A2:8D'
interfaces:
- - eth1: 'F8:4A:BF:55:A2:8E'
+ - eth1: 'F8:4A:BF:55:A2:8E'
ipmiIp: 172.16.130.26
ipmiPass: Huawei@123
roles:
@@ -65,4 +65,3 @@ hosts:
roles:
- compute
- ceph-osd
-
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 241ea650..09e32ff4 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -10,7 +10,7 @@ hosts:
- name: host1
mac: 'F8:4A:BF:55:A2:8D'
interfaces:
- - eth1: 'F8:4A:BF:55:A2:8E'
+ - eth1: 'F8:4A:BF:55:A2:8E'
ipmiIp: 172.16.130.26
ipmiPass: Huawei@123
roles:
@@ -63,4 +63,3 @@ hosts:
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 f7d2b587..9b175769 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -12,7 +12,7 @@ hosts:
- name: host1
mac: 'F8:4A:BF:55:A2:8D'
interfaces:
- - eth1: 'F8:4A:BF:55:A2:8E'
+ - eth1: 'F8:4A:BF:55:A2:8E'
ipmiIp: 172.16.130.26
ipmiPass: Huawei@123
roles:
@@ -65,4 +65,3 @@ hosts:
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 09d59628..1babf5a3 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -10,7 +10,7 @@ hosts:
- name: host1
mac: 'F8:4A:BF:55:A2:8D'
interfaces:
- - eth1: 'F8:4A:BF:55:A2:8E'
+ - eth1: 'F8:4A:BF:55:A2:8E'
ipmiIp: 172.16.130.26
ipmiPass: Huawei@123
roles:
@@ -63,4 +63,3 @@ hosts:
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 e7956d9b..4dba3e91 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -12,7 +12,7 @@ hosts:
- name: host1
mac: 'F8:4A:BF:55:A2:8D'
interfaces:
- - eth1: 'F8:4A:BF:55:A2:8E'
+ - eth1: 'F8:4A:BF:55:A2:8E'
ipmiIp: 172.16.130.26
ipmiPass: Huawei@123
roles:
@@ -65,4 +65,3 @@ hosts:
roles:
- compute
- ceph-osd
-
diff --git a/deploy/conf/hardware_environment/huawei-pod2/network.yml b/deploy/conf/hardware_environment/huawei-pod2/network.yml
index ab083472..810dbee2 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/network.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/network.yml
@@ -1,10 +1,11 @@
+---
nic_mappings: []
bond_mappings: []
provider_net_mappings:
- name: br-prv
network: physnet
- interface: eth1
+ interface: eth1
type: ovs
role:
- controller
@@ -20,7 +21,7 @@ sys_intf_mappings:
- compute
- name: storage
- interface: eth1
+ interface: eth1
vlan_tag: 102
type: vlan
role:
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.11.10"
- - "192.168.11.15"
+ - - "192.168.11.10"
+ - "192.168.11.15"
cidr: "192.168.11.0/24"
gw: "192.168.11.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ enable_dhcp: "False"
+ no_gateway: "False"
external_gw: "192.168.11.1"
floating_ip_cidr: "192.168.11.0/24"
floating_ip_start: "192.168.11.30"
diff --git a/deploy/conf/hardware_environment/huawei-pod2/network_ocl.yml b/deploy/conf/hardware_environment/huawei-pod2/network_ocl.yml
index 26319ec4..b0dd89ba 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/network_ocl.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/network_ocl.yml
@@ -1,10 +1,11 @@
+---
nic_mappings: []
bond_mappings: []
provider_net_mappings:
- name: br-prv
network: physnet
- interface: eth1
+ interface: eth1
type: ovs
role:
- controller
@@ -20,7 +21,7 @@ sys_intf_mappings:
- compute
- name: storage
- interface: eth1
+ interface: eth1
vlan_tag: 102
type: vlan
role:
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.11.10"
- - "192.168.11.15"
+ - - "192.168.11.10"
+ - "192.168.11.15"
cidr: "192.168.11.0/24"
gw: "192.168.11.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ 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"
diff --git a/deploy/conf/hardware_environment/huawei-pod2/network_onos.yml b/deploy/conf/hardware_environment/huawei-pod2/network_onos.yml
index 7f128774..834f523d 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/network_onos.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/network_onos.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.11.10"
- - "192.168.11.15"
+ - - "192.168.11.10"
+ - "192.168.11.15"
cidr: "192.168.11.0/24"
gw: "192.168.11.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ enable_dhcp: "False"
+ no_gateway: "False"
external_gw: "192.168.11.1"
floating_ip_cidr: "192.168.11.0/24"
floating_ip_start: "192.168.11.30"
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 a311c6d6..a44ab3ec 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
@@ -1,3 +1,4 @@
+---
TYPE: baremetal
FLAVOR: cluster
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 49df9ddc..1ff27a69 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
@@ -1,3 +1,4 @@
+---
TYPE: baremetal
FLAVOR: cluster
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 d62cdcdf..1cb8782b 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
@@ -1,3 +1,4 @@
+---
TYPE: baremetal
FLAVOR: cluster
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 4a1e2e9f..511da25a 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
@@ -1,3 +1,4 @@
+---
TYPE: baremetal
FLAVOR: cluster
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 96f42273..7e0cbc92 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
@@ -1,3 +1,4 @@
+---
TYPE: baremetal
FLAVOR: cluster
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 85aff3d7..ff6ffeb4 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
@@ -1,3 +1,4 @@
+---
TYPE: baremetal
FLAVOR: cluster
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 4b53c1df..0214b1cb 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
@@ -1,3 +1,4 @@
+---
TYPE: baremetal
FLAVOR: cluster
diff --git a/deploy/conf/hardware_environment/huawei-pod4/network.yml b/deploy/conf/hardware_environment/huawei-pod4/network.yml
index ff1038bd..48e703bb 100644
--- a/deploy/conf/hardware_environment/huawei-pod4/network.yml
+++ b/deploy/conf/hardware_environment/huawei-pod4/network.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.23.10"
- - "192.168.23.50"
+ - - "192.168.23.10"
+ - "192.168.23.50"
cidr: "192.168.10.0/24"
gw: "192.168.10.1"
role:
@@ -75,17 +76,16 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ enable_dhcp: "False"
+ no_gateway: "False"
external_gw: "192.168.23.1"
floating_ip_cidr: "192.168.23.0/24"
floating_ip_start: "192.168.23.100"
floating_ip_end: "192.168.23.200"
-
diff --git a/deploy/conf/hardware_environment/huawei-pod4/network_ocl.yml b/deploy/conf/hardware_environment/huawei-pod4/network_ocl.yml
index 5a5e9967..3e6fce20 100644
--- a/deploy/conf/hardware_environment/huawei-pod4/network_ocl.yml
+++ b/deploy/conf/hardware_environment/huawei-pod4/network_ocl.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.23.10"
- - "192.168.23.50"
+ - - "192.168.23.10"
+ - "192.168.23.50"
cidr: "192.168.23.0/24"
gw: "192.168.23.1"
role:
@@ -75,17 +76,16 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ 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-pod4/network_onos.yml b/deploy/conf/hardware_environment/huawei-pod4/network_onos.yml
index 76cfd028..8864378e 100644
--- a/deploy/conf/hardware_environment/huawei-pod4/network_onos.yml
+++ b/deploy/conf/hardware_environment/huawei-pod4/network_onos.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.23.10"
- - "192.168.23.50"
+ - - "192.168.23.10"
+ - "192.168.23.50"
cidr: "192.168.23.0/24"
gw: "192.168.23.1"
role:
@@ -75,17 +76,16 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ enable_dhcp: "False"
+ no_gateway: "False"
external_gw: "192.168.23.1"
floating_ip_cidr: "192.168.23.0/24"
floating_ip_start: "192.168.23.100"
floating_ip_end: "192.168.23.200"
-
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 771b7c4a..7638f127 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -10,7 +10,7 @@ hosts:
- name: host1
mac: 'E8:4D:D0:BA:63:49'
interfaces:
- - eth1: 'E8:4D:D0:BA:63:4A'
+ - eth1: 'E8:4D:D0:BA:63:4A'
ipmiIp: 172.16.131.17
ipmiPass: Huawei@123
roles:
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 f4e36f87..a5bbf974 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -10,7 +10,7 @@ hosts:
- name: host1
mac: 'E8:4D:D0:BA:63:49'
interfaces:
- - eth1: 'E8:4D:D0:BA:63:4A'
+ - eth1: 'E8:4D:D0:BA:63:4A'
ipmiIp: 172.16.131.17
ipmiPass: Huawei@123
roles:
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 5c41dc31..776d0b06 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -12,7 +12,7 @@ hosts:
- name: host1
mac: 'E8:4D:D0:BA:63:49'
interfaces:
- - eth1: 'E8:4D:D0:BA:63:4A'
+ - eth1: 'E8:4D:D0:BA:63:4A'
ipmiIp: 172.16.131.17
ipmiPass: Huawei@123
roles:
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 c4d04692..22c465b9 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -10,7 +10,7 @@ hosts:
- name: host1
mac: 'E8:4D:D0:BA:63:49'
interfaces:
- - eth1: 'E8:4D:D0:BA:63:4A'
+ - eth1: 'E8:4D:D0:BA:63:4A'
ipmiIp: 172.16.131.17
ipmiPass: Huawei@123
roles:
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 b77313af..83cfcfcb 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -12,7 +12,7 @@ hosts:
- name: host1
mac: 'E8:4D:D0:BA:63:49'
interfaces:
- - eth1: 'E8:4D:D0:BA:63:4A'
+ - eth1: 'E8:4D:D0:BA:63:4A'
ipmiIp: 172.16.131.17
ipmiPass: Huawei@123
roles:
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 5c27976b..ca74561a 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -10,7 +10,7 @@ hosts:
- name: host1
mac: 'E8:4D:D0:BA:63:49'
interfaces:
- - eth1: 'E8:4D:D0:BA:63:4A'
+ - eth1: 'E8:4D:D0:BA:63:4A'
ipmiIp: 172.16.131.17
ipmiPass: Huawei@123
roles:
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 5c27976b..ca74561a 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -10,7 +10,7 @@ hosts:
- name: host1
mac: 'E8:4D:D0:BA:63:49'
interfaces:
- - eth1: 'E8:4D:D0:BA:63:4A'
+ - eth1: 'E8:4D:D0:BA:63:4A'
ipmiIp: 172.16.131.17
ipmiPass: Huawei@123
roles:
diff --git a/deploy/conf/hardware_environment/huawei-pod5/network.yml b/deploy/conf/hardware_environment/huawei-pod5/network.yml
index 543fec39..eb66c29f 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/network.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/network.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.5.204"
- - "192.168.5.210"
+ - - "192.168.5.204"
+ - "192.168.5.210"
cidr: "192.168.5.0/24"
gw: "192.168.5.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ enable_dhcp: "False"
+ no_gateway: "False"
external_gw: "192.168.5.1"
floating_ip_cidr: "192.168.5.0/24"
floating_ip_start: "192.168.5.215"
diff --git a/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml b/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml
index 83c69a2c..7bcf1c52 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.5.204"
- - "192.168.5.210"
+ - - "192.168.5.204"
+ - "192.168.5.210"
cidr: "192.168.5.0/24"
gw: "192.168.5.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ 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"
diff --git a/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml b/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml
index 43b0e67b..bb2ebbb9 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.5.204"
- - "192.168.5.210"
+ - - "192.168.5.204"
+ - "192.168.5.210"
cidr: "192.168.5.0/24"
gw: "192.168.5.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ enable_dhcp: "False"
+ no_gateway: "False"
external_gw: "192.168.5.1"
floating_ip_cidr: "192.168.5.0/24"
floating_ip_start: "192.168.5.215"
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 fc28e1a2..3d1b2330 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -10,7 +10,7 @@ hosts:
- name: host1
mac: 'E0:97:96:10:67:83'
interfaces:
- - eth1: 'E0:97:96:10:67:8B'
+ - eth1: 'E0:97:96:10:67:8B'
ipmiIp: 192.168.5.173
ipmiPass: Huawei12#$
roles:
@@ -60,5 +60,3 @@ hosts:
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 9744164f..654a452b 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -10,7 +10,7 @@ hosts:
- name: host1
mac: 'E0:97:96:10:67:83'
interfaces:
- - eth1: 'E0:97:96:10:67:8B'
+ - eth1: 'E0:97:96:10:67:8B'
ipmiIp: 192.168.5.173
ipmiPass: Huawei12#$
roles:
@@ -59,4 +59,3 @@ hosts:
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 513fcb5d..1cf07fb8 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -12,7 +12,7 @@ hosts:
- name: host1
mac: 'E0:97:96:10:67:83'
interfaces:
- - eth1: 'E0:97:96:10:67:8B'
+ - eth1: 'E0:97:96:10:67:8B'
ipmiIp: 192.168.5.173
ipmiPass: Huawei12#$
roles:
@@ -65,5 +65,3 @@ hosts:
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 05fb2b25..605f3633 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -10,7 +10,7 @@ hosts:
- name: host1
mac: 'E0:97:96:10:67:83'
interfaces:
- - eth1: 'E0:97:96:10:67:8B'
+ - eth1: 'E0:97:96:10:67:8B'
ipmiIp: 192.168.5.173
ipmiPass: Huawei12#$
roles:
@@ -63,5 +63,3 @@ hosts:
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 8835b30f..d0b95f2a 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -12,7 +12,7 @@ hosts:
- name: host1
mac: 'E0:97:96:10:67:83'
interfaces:
- - eth1: 'E0:97:96:10:67:8B'
+ - eth1: 'E0:97:96:10:67:8B'
ipmiIp: 192.168.5.173
ipmiPass: Huawei12#$
roles:
@@ -65,5 +65,3 @@ hosts:
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 8ea31401..fefae6fd 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -10,7 +10,7 @@ hosts:
- name: host1
mac: 'E0:97:96:10:67:83'
interfaces:
- - eth1: 'E0:97:96:10:67:8B'
+ - eth1: 'E0:97:96:10:67:8B'
ipmiIp: 192.168.5.173
ipmiPass: Huawei12#$
roles:
@@ -63,5 +63,3 @@ hosts:
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 0dc211af..c52d69ef 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
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -12,7 +12,7 @@ hosts:
- name: host1
mac: 'E0:97:96:10:67:83'
interfaces:
- - eth1: 'E0:97:96:10:67:8B'
+ - eth1: 'E0:97:96:10:67:8B'
ipmiIp: 192.168.5.173
ipmiPass: Huawei12#$
roles:
@@ -65,4 +65,3 @@ hosts:
roles:
- compute
- ceph-osd
-
diff --git a/deploy/conf/hardware_environment/intel-pod8/network.yml b/deploy/conf/hardware_environment/intel-pod8/network.yml
index 5107649d..7f00bc3e 100644
--- a/deploy/conf/hardware_environment/intel-pod8/network.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/network.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "10.8.14.10"
- - "10.8.14.30"
+ - - "10.8.14.10"
+ - "10.8.14.30"
cidr: "10.8.14.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "10.8.12.10"
- - "10.8.12.30"
+ - - "10.8.12.10"
+ - "10.8.12.30"
cidr: "10.8.12.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "10.8.15.10"
- - "10.8.15.30"
+ - - "10.8.15.10"
+ - "10.8.15.30"
cidr: "10.8.15.0/24"
gw: "10.8.15.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth4
public_net_info:
- enable: True
+ 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
+ enable_dhcp: "False"
+ no_gateway: "False"
external_gw: "10.8.15.1"
floating_ip_cidr: "10.8.15.0/24"
floating_ip_start: "10.8.15.100"
diff --git a/deploy/conf/hardware_environment/intel-pod8/network_ocl.yml b/deploy/conf/hardware_environment/intel-pod8/network_ocl.yml
index 5107649d..7f00bc3e 100644
--- a/deploy/conf/hardware_environment/intel-pod8/network_ocl.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/network_ocl.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "10.8.14.10"
- - "10.8.14.30"
+ - - "10.8.14.10"
+ - "10.8.14.30"
cidr: "10.8.14.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "10.8.12.10"
- - "10.8.12.30"
+ - - "10.8.12.10"
+ - "10.8.12.30"
cidr: "10.8.12.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "10.8.15.10"
- - "10.8.15.30"
+ - - "10.8.15.10"
+ - "10.8.15.30"
cidr: "10.8.15.0/24"
gw: "10.8.15.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth4
public_net_info:
- enable: True
+ 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
+ enable_dhcp: "False"
+ no_gateway: "False"
external_gw: "10.8.15.1"
floating_ip_cidr: "10.8.15.0/24"
floating_ip_start: "10.8.15.100"
diff --git a/deploy/conf/hardware_environment/intel-pod8/network_onos.yml b/deploy/conf/hardware_environment/intel-pod8/network_onos.yml
index c6adfd72..e1d099a1 100644
--- a/deploy/conf/hardware_environment/intel-pod8/network_onos.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/network_onos.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "10.8.14.10"
- - "10.8.14.30"
+ - - "10.8.14.10"
+ - "10.8.14.30"
cidr: "10.8.14.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "10.8.12.10"
- - "10.8.12.30"
+ - - "10.8.12.10"
+ - "10.8.12.30"
cidr: "10.8.12.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "10.8.15.10"
- - "10.8.15.30"
+ - - "10.8.15.10"
+ - "10.8.15.30"
cidr: "10.8.15.0/24"
gw: "10.8.15.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth1
public_net_info:
- enable: True
+ 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
+ enable_dhcp: "False"
+ no_gateway: "False"
external_gw: "10.8.15.1"
floating_ip_cidr: "10.8.15.0/24"
floating_ip_start: "10.8.15.100"
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml
index 87c1e72b..1d1fd529 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -66,4 +66,3 @@ hosts:
roles:
- compute
- ceph-osd
-
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml
index a320174f..026e40aa 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml
@@ -1,3 +1,4 @@
+---
TYPE: baremetal
FLAVOR: cluster
@@ -65,4 +66,3 @@ hosts:
roles:
- compute
- ceph-osd
-
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml
index dde9ebe1..c065f5c6 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -71,4 +71,3 @@ hosts:
roles:
- compute
- ceph-osd
-
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml
index 59f353ec..13e7fd0d 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -69,4 +69,3 @@ hosts:
roles:
- compute
- ceph-osd
-
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml
index 7aa31ffb..04fba033 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -71,4 +71,3 @@ hosts:
roles:
- compute
- ceph-osd
-
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml
index a7b49f3d..57a790ea 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -69,4 +69,3 @@ hosts:
roles:
- compute
- ceph-osd
-
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml
index da8c1cd3..1edd0276 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml
@@ -1,4 +1,4 @@
-
+---
TYPE: baremetal
FLAVOR: cluster
POWER_TOOL: ipmitool
@@ -71,4 +71,3 @@ hosts:
roles:
- compute
- ceph-osd
-
diff --git a/deploy/conf/network_cfg.yaml b/deploy/conf/network_cfg.yaml
index 07d9016c..bdcae8f1 100644
--- a/deploy/conf/network_cfg.yaml
+++ b/deploy/conf/network_cfg.yaml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.50.210"
- - "192.168.50.220"
+ - - "192.168.50.210"
+ - "192.168.50.220"
cidr: "192.168.50.0/24"
gw: "192.168.50.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ enable_dhcp: "False"
+ no_gateway: "False"
external_gw: "192.168.50.1"
floating_ip_cidr: "192.168.50.0/24"
floating_ip_start: "192.168.50.221"
diff --git a/deploy/conf/network_cfg_ocl.yaml b/deploy/conf/network_cfg_ocl.yaml
index 3a124a92..212180fd 100644
--- a/deploy/conf/network_cfg_ocl.yaml
+++ b/deploy/conf/network_cfg_ocl.yaml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.50.210"
- - "192.168.50.220"
+ - - "192.168.50.210"
+ - "192.168.50.220"
cidr: "192.168.50.0/24"
gw: "192.168.50.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ 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"
diff --git a/deploy/conf/network_cfg_onos.yaml b/deploy/conf/network_cfg_onos.yaml
index 3f12194e..56a4ce06 100644
--- a/deploy/conf/network_cfg_onos.yaml
+++ b/deploy/conf/network_cfg_onos.yaml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.50.210"
- - "192.168.50.220"
+ - - "192.168.50.210"
+ - "192.168.50.220"
cidr: "192.168.50.0/24"
gw: "192.168.50.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ enable_dhcp: "False"
+ no_gateway: "False"
external_gw: "192.168.50.1"
floating_ip_cidr: "192.168.50.0/24"
floating_ip_start: "192.168.50.221"
diff --git a/deploy/conf/neutron_cfg.yaml b/deploy/conf/neutron_cfg.yaml
index ce6e1920..af01f989 100644
--- a/deploy/conf/neutron_cfg.yaml
+++ b/deploy/conf/neutron_cfg.yaml
@@ -1,3 +1,4 @@
+---
openvswitch:
tenant_network_type: vxlan
network_vlan_ranges:
diff --git a/deploy/conf/vm_environment/huawei-virtual1/network.yml b/deploy/conf/vm_environment/huawei-virtual1/network.yml
index 7fce6381..d7e8e061 100644
--- a/deploy/conf/vm_environment/huawei-virtual1/network.yml
+++ b/deploy/conf/vm_environment/huawei-virtual1/network.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.107.210"
- - "192.168.107.220"
+ - - "192.168.107.210"
+ - "192.168.107.220"
cidr: "192.168.107.0/24"
gw: "192.168.107.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ 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"
diff --git a/deploy/conf/vm_environment/huawei-virtual1/network_ocl.yml b/deploy/conf/vm_environment/huawei-virtual1/network_ocl.yml
index 80b97656..c0c6915b 100644
--- a/deploy/conf/vm_environment/huawei-virtual1/network_ocl.yml
+++ b/deploy/conf/vm_environment/huawei-virtual1/network_ocl.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.107.210"
- - "192.168.107.220"
+ - - "192.168.107.210"
+ - "192.168.107.220"
cidr: "192.168.107.0/24"
gw: "192.168.107.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ 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"
diff --git a/deploy/conf/vm_environment/huawei-virtual1/network_onos.yml b/deploy/conf/vm_environment/huawei-virtual1/network_onos.yml
index 0c9a9cb9..7bf208a9 100644
--- a/deploy/conf/vm_environment/huawei-virtual1/network_onos.yml
+++ b/deploy/conf/vm_environment/huawei-virtual1/network_onos.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.107.210"
- - "192.168.107.220"
+ - - "192.168.107.210"
+ - "192.168.107.220"
cidr: "192.168.107.0/24"
gw: "192.168.107.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ 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"
diff --git a/deploy/conf/vm_environment/huawei-virtual2/network.yml b/deploy/conf/vm_environment/huawei-virtual2/network.yml
index b11cba01..0f01a411 100644
--- a/deploy/conf/vm_environment/huawei-virtual2/network.yml
+++ b/deploy/conf/vm_environment/huawei-virtual2/network.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.106.210"
- - "192.168.106.220"
+ - - "192.168.106.210"
+ - "192.168.106.220"
cidr: "192.168.106.0/24"
gw: "192.168.106.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ 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"
diff --git a/deploy/conf/vm_environment/huawei-virtual2/network_ocl.yml b/deploy/conf/vm_environment/huawei-virtual2/network_ocl.yml
index 743317c5..85c5bb1a 100644
--- a/deploy/conf/vm_environment/huawei-virtual2/network_ocl.yml
+++ b/deploy/conf/vm_environment/huawei-virtual2/network_ocl.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.106.210"
- - "192.168.106.220"
+ - - "192.168.106.210"
+ - "192.168.106.220"
cidr: "192.168.106.0/24"
gw: "192.168.106.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ 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"
diff --git a/deploy/conf/vm_environment/huawei-virtual2/network_onos.yml b/deploy/conf/vm_environment/huawei-virtual2/network_onos.yml
index bfd9ac1b..9998d981 100644
--- a/deploy/conf/vm_environment/huawei-virtual2/network_onos.yml
+++ b/deploy/conf/vm_environment/huawei-virtual2/network_onos.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.106.210"
- - "192.168.106.220"
+ - - "192.168.106.210"
+ - "192.168.106.220"
cidr: "192.168.106.0/24"
gw: "192.168.106.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ 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"
diff --git a/deploy/conf/vm_environment/huawei-virtual3/network.yml b/deploy/conf/vm_environment/huawei-virtual3/network.yml
index 9cb6f201..9bcd2c2c 100644
--- a/deploy/conf/vm_environment/huawei-virtual3/network.yml
+++ b/deploy/conf/vm_environment/huawei-virtual3/network.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.101.210"
- - "192.168.101.220"
+ - - "192.168.101.210"
+ - "192.168.101.220"
cidr: "192.168.101.0/24"
gw: "192.168.101.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ enable_dhcp: "False"
+ no_gateway: "False"
external_gw: "192.168.101.1"
floating_ip_cidr: "192.168.101.0/24"
floating_ip_start: "192.168.101.101"
diff --git a/deploy/conf/vm_environment/huawei-virtual3/network_ocl.yml b/deploy/conf/vm_environment/huawei-virtual3/network_ocl.yml
index 9cccf9ba..5ef93711 100644
--- a/deploy/conf/vm_environment/huawei-virtual3/network_ocl.yml
+++ b/deploy/conf/vm_environment/huawei-virtual3/network_ocl.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.101.210"
- - "192.168.101.220"
+ - - "192.168.101.210"
+ - "192.168.101.220"
cidr: "192.168.101.0/24"
gw: "192.168.101.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ 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"
diff --git a/deploy/conf/vm_environment/huawei-virtual3/network_onos.yml b/deploy/conf/vm_environment/huawei-virtual3/network_onos.yml
index 35fb797d..d24ce0db 100644
--- a/deploy/conf/vm_environment/huawei-virtual3/network_onos.yml
+++ b/deploy/conf/vm_environment/huawei-virtual3/network_onos.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.101.210"
- - "192.168.101.220"
+ - - "192.168.101.210"
+ - "192.168.101.220"
cidr: "192.168.101.0/24"
gw: "192.168.101.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ enable_dhcp: "False"
+ no_gateway: "False"
external_gw: "192.168.101.1"
floating_ip_cidr: "192.168.101.0/24"
floating_ip_start: "192.168.101.101"
diff --git a/deploy/conf/vm_environment/huawei-virtual4/network.yml b/deploy/conf/vm_environment/huawei-virtual4/network.yml
index d7876891..5a7f3d00 100644
--- a/deploy/conf/vm_environment/huawei-virtual4/network.yml
+++ b/deploy/conf/vm_environment/huawei-virtual4/network.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.103.210"
- - "192.168.103.220"
+ - - "192.168.103.210"
+ - "192.168.103.220"
cidr: "192.168.103.0/24"
gw: "192.168.103.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ enable_dhcp: "False"
+ no_gateway: "False"
external_gw: "192.168.103.1"
floating_ip_cidr: "192.168.103.0/24"
floating_ip_start: "192.168.103.101"
diff --git a/deploy/conf/vm_environment/huawei-virtual4/network_ocl.yml b/deploy/conf/vm_environment/huawei-virtual4/network_ocl.yml
index 1e9b7f4d..a974e224 100644
--- a/deploy/conf/vm_environment/huawei-virtual4/network_ocl.yml
+++ b/deploy/conf/vm_environment/huawei-virtual4/network_ocl.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.103.210"
- - "192.168.103.220"
+ - - "192.168.103.210"
+ - "192.168.103.220"
cidr: "192.168.103.0/24"
gw: "192.168.103.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ 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"
diff --git a/deploy/conf/vm_environment/huawei-virtual4/network_onos.yml b/deploy/conf/vm_environment/huawei-virtual4/network_onos.yml
index 73e6fe47..be2cb0b6 100644
--- a/deploy/conf/vm_environment/huawei-virtual4/network_onos.yml
+++ b/deploy/conf/vm_environment/huawei-virtual4/network_onos.yml
@@ -1,3 +1,4 @@
+---
nic_mappings: []
bond_mappings: []
@@ -37,8 +38,8 @@ sys_intf_mappings:
ip_settings:
- name: mgmt
ip_ranges:
- - - "172.16.1.1"
- - "172.16.1.254"
+ - - "172.16.1.1"
+ - "172.16.1.254"
cidr: "172.16.1.0/24"
role:
- controller
@@ -46,8 +47,8 @@ ip_settings:
- name: storage
ip_ranges:
- - - "172.16.2.1"
- - "172.16.2.254"
+ - - "172.16.2.1"
+ - "172.16.2.254"
cidr: "172.16.2.0/24"
role:
- controller
@@ -55,8 +56,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.103.210"
- - "192.168.103.220"
+ - - "192.168.103.210"
+ - "192.168.103.220"
cidr: "192.168.103.0/24"
gw: "192.168.103.1"
role:
@@ -75,15 +76,15 @@ public_vip:
onos_nic: eth2
public_net_info:
- enable: True
+ 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
+ enable_dhcp: "False"
+ no_gateway: "False"
external_gw: "192.168.103.1"
floating_ip_cidr: "192.168.103.0/24"
floating_ip_start: "192.168.103.101"
diff --git a/deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml b/deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml
index aa2a1b3e..7a4f92b8 100644
--- a/deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml
+++ b/deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml
@@ -1,3 +1,4 @@
+---
TYPE: virtual
FLAVOR: cluster
diff --git a/deploy/conf/vm_environment/os-ocl-nofeature-ha.yml b/deploy/conf/vm_environment/os-ocl-nofeature-ha.yml
index bdcada8f..8e2083a3 100644
--- a/deploy/conf/vm_environment/os-ocl-nofeature-ha.yml
+++ b/deploy/conf/vm_environment/os-ocl-nofeature-ha.yml
@@ -1,3 +1,4 @@
+---
TYPE: virtual
FLAVOR: cluster
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 6b5a1f61..d64d7dd9 100644
--- a/deploy/conf/vm_environment/os-odl_l2-moon-ha.yml
+++ b/deploy/conf/vm_environment/os-odl_l2-moon-ha.yml
@@ -1,3 +1,4 @@
+---
TYPE: virtual
FLAVOR: cluster
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 df84a741..b8daef70 100644
--- a/deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml
+++ b/deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml
@@ -1,3 +1,4 @@
+---
TYPE: virtual
FLAVOR: cluster
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 aff6bcb7..3faab674 100644
--- a/deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml
+++ b/deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml
@@ -1,3 +1,4 @@
+---
TYPE: virtual
FLAVOR: cluster
diff --git a/deploy/conf/vm_environment/os-onos-nofeature-ha.yml b/deploy/conf/vm_environment/os-onos-nofeature-ha.yml
index 82797ef8..ae894d4b 100644
--- a/deploy/conf/vm_environment/os-onos-nofeature-ha.yml
+++ b/deploy/conf/vm_environment/os-onos-nofeature-ha.yml
@@ -1,3 +1,4 @@
+---
TYPE: virtual
FLAVOR: cluster
diff --git a/deploy/conf/vm_environment/os-onos-sfc-ha.yml b/deploy/conf/vm_environment/os-onos-sfc-ha.yml
index 402b3924..cce350d5 100644
--- a/deploy/conf/vm_environment/os-onos-sfc-ha.yml
+++ b/deploy/conf/vm_environment/os-onos-sfc-ha.yml
@@ -1,3 +1,4 @@
+---
TYPE: virtual
FLAVOR: cluster
diff --git a/deploy/conf/vm_environment/virtual_cluster_expansion.yml b/deploy/conf/vm_environment/virtual_cluster_expansion.yml
index 3d3298d3..fbc1a461 100644
--- a/deploy/conf/vm_environment/virtual_cluster_expansion.yml
+++ b/deploy/conf/vm_environment/virtual_cluster_expansion.yml
@@ -1,3 +1,4 @@
+---
TYPE: virtual
FLAVOR: cluster
@@ -5,3 +6,4 @@ hosts:
- name: host6
roles:
- compute
+ - ceph-osd