reclass: Fix all remaining yamllint warning

[fuel.git] / mcp / reclass / classes / cluster / virtual-mcp-ocata-common / openstack_compute.yml

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
index 0cb7ccb..ddd804a 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
@@ -1,25 +1,26 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.linux.storage.loopback
-- system.nova.compute.single
-- service.neutron.compute.single
-- service.cinder.volume.single
-- system.cinder.volume.backend.lvm
-- system.ceilometer.agent.cluster
-- system.ceilometer.client.nova_compute
-- system.ceilometer.client.cinder_volume
+  - system.linux.storage.loopback
+  - service.nfs.client
+  - system.nova.compute.single
+  - service.neutron.compute.single
+  - service.cinder.volume.single
+  - system.cinder.volume.backend.lvm
+  - system.ceilometer.agent.cluster
+  - system.ceilometer.client.nova_compute
+  - system.ceilometer.client.cinder_volume
 parameters:
   _param:
-    primary_interface: ens4
-    tenant_interface: ens5
-    external_interface: ens6
+    primary_interface: ${_param:opnfv_fn_vm_secondary_interface}
+    tenant_interface: ${_param:opnfv_fn_vm_tertiary_interface}
+    external_interface: ${_param:opnfv_fn_vm_quaternary_interface}
     interface_mtu: 9000
     linux_system_codename: xenial
-    loopback_device_size: 10
+    loopback_device_size: 20
   nova:
     compute:
+      libvirt_service: libvirtd
+      libvirt_bin: /etc/default/libvirtd
       vncproxy_url: http://${_param:cluster_vip_address}:6080
       network:
         region: ${_param:openstack_region}
@@ -44,20 +45,38 @@ parameters:
         host: ${_param:cluster_local_address}
       message_queue:
         host: ${_param:cluster_local_address}
+  nfs:
+    client:
+      mount:
+        nfs:
+          path: /var/lib/nova/instances
+          fstype: nfs
+          device: ${_param:openstack_control_address}:/srv/nova/instances
   linux:
+    system:
+      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
+          key_server: keyserver.ubuntu.com
+      kernel:
+        sysctl:
+          vm.dirty_ratio: 10
+          vm.dirty_background_ratio: 5
     network:
       bridge: openvswitch
       interface:
         dhcp_int:
           enabled: true
-          name: ens3
+          name: ${_param:opnfv_fn_vm_primary_interface}
           proto: dhcp
           type: eth
           mtu: ${_param:interface_mtu}
         primary_interface:
           enabled: true
           name: ${_param:primary_interface}
-          mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         tenant_interface:
@@ -73,4 +92,4 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:primary_interface}
+            - ${_param:primary_interface}