yamllint: Fix recently introduced errors

[fuel.git] / mcp / reclass / classes / cluster / baremetal-mcp-ocata-ovs-dpdk-ha / openstack / compute.yml

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
index 126751c..ca191ad 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
@@ -1,18 +1,18 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.linux.storage.loopback
-- system.glusterfs.client.cluster
-- system.nova.compute.cluster
-- system.nova.compute.nfv.hugepages
-- system.nova.compute.nfv.cpu_pinning
-- system.neutron.compute.nfv.dpdk
-- system.neutron.gateway.cluster
-- system.cinder.volume.single
-- system.cinder.volume.backend.lvm
-- system.ceilometer.agent.cluster
-- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.storage.loopback
+  - system.glusterfs.client.cluster
+  - system.nova.compute.cluster
+  - system.nova.compute.nfv.hugepages
+  - system.nova.compute.nfv.cpu_pinning
+  - system.neutron.compute.nfv.dpdk
+  - system.neutron.gateway.cluster
+  - system.cinder.volume.single
+  - system.cinder.volume.backend.lvm
+  - system.ceilometer.agent.cluster
+  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
 parameters:
   _param:
     cluster_vip_address: ${_param:openstack_control_address}
@@ -24,16 +24,16 @@ parameters:
     cluster_node03_hostname: ctl03
     cluster_node03_address: ${_param:openstack_control_node03_address}
     nova_vncproxy_url: https://${_param:cluster_public_host}:6080
-    mgmt_nic: enp6s0
-    linux_system_codename: xenial
-    external_nic: enp8s0
+    mgmt_nic: ${_param:openstack_primary_nic}
+    external_nic: ${_param:openstack_tertiary_nic}
     interface_mtu: 1500
     keepalived_vip_interface: br-ctl
     keepalived_vip_virtual_router_id: 69
     loopback_device_size: 20
+    linux_system_codename: xenial
   neutron:
     gateway:
-      dpdk: True
+      dpdk: 'True'
       backend:
         tenant_vlan_range: ${_param:neutron_tenant_vlan_range}
   nova:
@@ -48,6 +48,7 @@ parameters:
           server: ${_param:glusterfs_service_host}
           user: nova
           group: nova
+          # yamllint disable-line rule:line-length
           opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}"
   linux:
     system:
@@ -57,6 +58,7 @@ parameters:
           vm.dirty_background_ratio: 5
       repo:
         uca:
+          # yamllint disable-line rule:line-length
           source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
           architectures: amd64
           key_id: EC4926EA
@@ -75,13 +77,13 @@ parameters:
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
-        vlan300:
+        mgmt-vlan:
           enabled: true
           proto: manual
           type: vlan
-          name: ${_param:mgmt_nic}.300
+          name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
           use_interfaces:
-          - ${_param:mgmt_nic}
+            - ${_param:mgmt_nic}
         br-ctl:
           enabled: true
           type: bridge
@@ -89,7 +91,7 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:mgmt_nic}.300
+            - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
         br-floating:
           enabled: true
           type: ovs_bridge
@@ -106,9 +108,9 @@ parameters:
           address: ${_param:external_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:external_nic}
+            - ${_param:external_nic}
           use_ovs_ports:
-          - float-to-ex
+            - float-to-ex
         dpdk0:
           name: ${_param:dpdk0_name}
           pci: ${_param:dpdk0_pci}