From 8a867449217151f59766a74c6165ffc26c7f50b4 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 25 Nov 2017 17:41:20 +0100 Subject: Bring in newer glusterfs for mtime unsplit brain Recent commit 8ba3a1a (Switch nofeature-ha compute nodes to UCA repo) bumped the reclass/system submodule and brought in upstream commit 2ee306b (Glusterfs: use automatic mtime-based split-brain resolution) which requires support for "cluster.favorite-child-policy", not available in Glusterfs 3.7.x available in Ubuntu Xenial. NOTE: UCA does not provide glusterfs for "Ocata", only for "Pike"+. Instead of reverting the commit switching to mtime brain un-split, bump glusterfs to a version that is not EOL (3.10) using their official PPA. Change-Id: I4606dda2f3d4b7563eea793cc8e5d1380f336f24 Signed-off-by: Alexandru Avadanii --- mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml | 2 ++ .../classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml | 2 ++ .../classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml | 2 ++ 3 files changed, 6 insertions(+) (limited to 'mcp') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml index 7f2f57219..7138d681e 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml @@ -9,6 +9,7 @@ classes: - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra + - system.linux.system.repo.glusterfs - service.keepalived.cluster.single - system.glusterfs.server.volume.glance - system.glusterfs.server.volume.keystone @@ -26,6 +27,7 @@ classes: parameters: _param: linux_system_codename: xenial + glusterfs_version: '3.10' cluster_vip_address: ${_param:infra_kvm_address} cluster_node01_address: ${_param:infra_kvm_node01_address} cluster_node02_address: ${_param:infra_kvm_node02_address} 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 7163a8108..e07e61139 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml @@ -8,6 +8,7 @@ --- classes: - system.linux.system.repo.mcp.extra + - system.linux.system.repo.glusterfs - system.linux.storage.loopback - system.glusterfs.client.cluster - system.nova.compute.cluster @@ -34,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} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml index 6d942281c..ce82807ce 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml @@ -9,6 +9,7 @@ classes: - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra + - system.linux.system.repo.glusterfs - system.ceilometer.client - system.memcached.server.single - system.keystone.server.cluster @@ -39,6 +40,7 @@ parameters: cluster_node03_hostname: ctl03 cluster_node03_address: ${_param:openstack_control_node03_address} nova_vncproxy_url: https://${_param:cluster_public_host}:6080 + glusterfs_version: '3.10' dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux: -- cgit 1.2.3-korg