From 8d4c3285d86ece6a25609ccb207ac5fb903d1d28 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Sat, 25 Nov 2017 17:41:20 +0100 Subject: Return back repo with glusterfs Glusterfs 3.11 package from UCA repo has the bug#875651, which causes package instalation error due to timeout of glustereventsd service startup. Therefore get the latest version from PPA repo. Change-Id: Ia47d969e758c8689508dfd6b7fd2725514ea88c5 Co-Authored-By: Alexandru Avadanii 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 insertions(+) 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 fe9646535..dae8ad62f 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,6 +7,7 @@ ############################################################################## --- classes: + - system.linux.system.repo.glusterfs - service.keepalived.cluster.single - system.glusterfs.server.volume.glance - system.glusterfs.server.volume.keystone @@ -24,6 +25,7 @@ classes: parameters: _param: linux_system_codename: xenial + glusterfs_version: '3.13' 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 632404416..50241b4f0 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,6 +7,7 @@ ############################################################################## --- classes: + - system.linux.system.repo.glusterfs - system.linux.storage.loopback - system.glusterfs.client.cluster - system.nova.compute.cluster @@ -33,6 +34,7 @@ parameters: keepalived_vip_virtual_router_id: 69 loopback_device_size: 20 linux_system_codename: xenial + glusterfs_version: '3.13' # {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 2cf0596d2..0abe3655e 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,6 +7,7 @@ ############################################################################## --- classes: + - system.linux.system.repo.glusterfs - system.ceilometer.client - system.memcached.server.single - system.keystone.server.cluster @@ -37,6 +38,7 @@ parameters: cluster_node03_hostname: ${_param:openstack_control_node03_hostname} cluster_node03_address: ${_param:openstack_control_node03_address} nova_vncproxy_url: https://${_param:cluster_public_host}:6080 + glusterfs_version: '3.13' dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux: -- cgit 1.2.3-korg