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/vm_environment | |
| parent | 6072a49adb33f2bce3f48b9c7b8be7d96cf8501c (diff) | |
Yamllint test
JIRA: COMPASS-516
Change-Id: I482ce9bc86f4f963258c5b8823e0b00e83556eef
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/conf/vm_environment')
20 files changed, 129 insertions, 108 deletions
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 |