From 759f1d74d0345463030af0bde47f57b42e21c4d1 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Mon, 11 Dec 2017 15:13:25 +0000 Subject: [PATCH] Revert "Bring in newer glusterfs for mtime unsplit brain" Since the uca/pike repo has version of 3.11 This reverts commit 8a867449217151f59766a74c6165ffc26c7f50b4. Change-Id: I5cc0d94b4a1b53b987fab03bc20466ee3c3eb8b2 Signed-off-by: Michael Polenchuk --- mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml | 2 -- .../classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml | 2 -- .../classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml | 2 -- 3 files changed, 6 deletions(-) diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml index df94e284f..f0d91e304 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml @@ -7,7 +7,6 @@ ############################################################################## --- classes: - - system.linux.system.repo.glusterfs - service.keepalived.cluster.single - system.glusterfs.server.volume.glance - system.glusterfs.server.volume.keystone @@ -25,7 +24,6 @@ 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-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml index b86049ade..b63baa41b 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml @@ -7,7 +7,6 @@ ############################################################################## --- classes: - - system.linux.system.repo.glusterfs - system.linux.storage.loopback - system.glusterfs.client.cluster - system.nova.compute.cluster @@ -34,7 +33,6 @@ 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-pike-common-ha/openstack_control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml index 12fc7b07e..083d0a8b7 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml @@ -7,7 +7,6 @@ ############################################################################## --- classes: - - system.linux.system.repo.glusterfs - system.ceilometer.client - system.memcached.server.single - system.keystone.server.cluster @@ -38,7 +37,6 @@ 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: -- 2.16.6