Merge "[virtual] Update dpdk scenario with pike"

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

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
index 30dda2f..e07e611 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
@@ -7,8 +7,8 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.openstack
   - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.glusterfs
   - system.linux.storage.loopback
   - system.glusterfs.client.cluster
   - system.nova.compute.cluster
@@ -35,6 +35,7 @@ parameters:
     keepalived_vip_virtual_router_id: 69
     loopback_device_size: 20
     linux_system_codename: xenial
+    glusterfs_version: '3.10'
     # {dhcp,single}_nic are not used, but referenced
     dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
     single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
@@ -47,6 +48,9 @@ parameters:
           # yamllint disable-line rule:line-length
           opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}"
   linux:
+    network:
+      remove_iface_files:
+        - '/etc/network/interfaces.d/50-cloud-init.cfg'
     system:
       kernel:
         sysctl: