diff options
Diffstat (limited to 'deploy/conf/hardware_environment')
51 files changed, 218 insertions, 222 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 - |