From 92f6ca7bb6d7b2f295406aab34094b1dba76ff94 Mon Sep 17 00:00:00 2001 From: liyuenan Date: Tue, 27 Dec 2016 17:44:34 +0800 Subject: Yamllint test JIRA: COMPASS-516 Change-Id: I482ce9bc86f4f963258c5b8823e0b00e83556eef Signed-off-by: liyuenan --- .../conf/hardware_environment/intel-pod8/network.yml | 19 ++++++++++--------- .../hardware_environment/intel-pod8/network_ocl.yml | 19 ++++++++++--------- .../hardware_environment/intel-pod8/network_onos.yml | 19 ++++++++++--------- .../intel-pod8/os-nosdn-nofeature-ha.yml | 3 +-- .../intel-pod8/os-ocl-nofeature-ha.yml | 2 +- .../intel-pod8/os-odl_l2-moon-ha.yml | 3 +-- .../intel-pod8/os-odl_l2-nofeature-ha.yml | 3 +-- .../intel-pod8/os-odl_l3-nofeature-ha.yml | 3 +-- .../intel-pod8/os-onos-nofeature-ha.yml | 3 +-- .../intel-pod8/os-onos-sfc-ha.yml | 3 +-- 10 files changed, 37 insertions(+), 40 deletions(-) (limited to 'deploy/conf/hardware_environment/intel-pod8') 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 - -- cgit 1.2.3-korg