From 057a69974a433b4cac6ed51a92b95ffc4517edf5 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 7 Mar 2018 23:02:40 +0100 Subject: u/fuel: Bump & rebase for net_config ip-range JIRA: FUEL-351 Change-Id: I7b893e9d94eaf9e34daee3bf4442229be964c294 Signed-off-by: Alexandru Avadanii --- .../0012-glusterfs-Use-3.12-for-AArch64.patch | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch') diff --git a/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch b/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch index c8c546b4..c37ba01e 100644 --- a/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch +++ b/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch @@ -15,13 +15,13 @@ so stick to 3.12 for now. Signed-off-by: Alexandru Avadanii --- - mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml | 2 +- - mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml | 2 +- - mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml | 2 +- + mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml | 2 +- + mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml | 2 +- + mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml -index 84b392e..1209f31 100644 +index 84b392e6..1209f312 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml @@ -28,7 +28,7 @@ classes: @@ -34,10 +34,10 @@ index 84b392e..1209f31 100644 cluster_node01_address: ${_param:infra_kvm_node01_address} cluster_node02_address: ${_param:infra_kvm_node02_address} diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml -index dd610ea..6aa7b5d 100644 +index a6c3d9ed..d730c935 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml -@@ -35,7 +35,7 @@ parameters: +@@ -34,7 +34,7 @@ parameters: keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 linux_system_codename: xenial @@ -46,16 +46,16 @@ index dd610ea..6aa7b5d 100644 glusterfs: client: volumes: -diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml -index b08f3c2..84d35be 100644 ---- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml -+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml -@@ -38,7 +38,7 @@ parameters: +diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 +index c487e342..62c1ab28 100644 +--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 ++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 +@@ -66,7 +66,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' + glusterfs_version: '3.12' + {%- if conf.MCP_VCP %} heat: server: - metadata: -- cgit 1.2.3-korg