diff options
| author |   liyuenan <liyuenan@huawei.com> | 2016-12-27 17:44:34 +0800 |
|---|---|---|
| committer | liyuenan <liyuenan@huawei.com> | 2017-01-05 09:42:35 +0800 |
| commit | 92f6ca7bb6d7b2f295406aab34094b1dba76ff94 (patch) | |
| tree | c4e62927a3bf9862f7ba9ce286cbece2c4335ef4 /deploy/conf/hardware_environment/huawei-pod2 | |
| parent | 6072a49adb33f2bce3f48b9c7b8be7d96cf8501c (diff) | |
Yamllint test
JIRA: COMPASS-516
Change-Id: I482ce9bc86f4f963258c5b8823e0b00e83556eef
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/conf/hardware_environment/huawei-pod2')
10 files changed, 41 insertions, 31 deletions
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 |