p/fuel: Pin glusterfs to 3.12 for AArch64

glusterfs PPA for 3.13 does not have arm64 binaries *yet*, so pin
to 3.12 for now.

While at it, bump Fuel@OPNFV submodule.

Change-Id: I989fcfa43748015e46d760b9908c633238dae574
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch b/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch
index bceb6d0..bea9f95 100644 (file)
--- a/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch
+++ b/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch
@@ -25,7 +25,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  2 files changed, 2 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 dae8ad6..6ed97fb 100644
+index f413aef..23f09a7 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 @@
@@ -37,7 +37,7 @@ index dae8ad6..6ed97fb 100644
    - service.keepalived.cluster.single
    - system.glusterfs.server.volume.glance
 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 50241b4..431fde6 100644
+index 5c077d5..78c4a0a 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 @@

diff --git a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
index d87a286..aac8b0d 100644 (file)
--- a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
+++ b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
@@ -73,10 +73,10 @@ index a87a935..fe3ff14 100644
  /usr/share/salt-formulas/env: 0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
 +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
-index 93db0ed..bffab44 100644
+index 56cd96b..141f363 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
-@@ -110,6 +110,32 @@ parameters:
+@@ -107,6 +107,32 @@ parameters:
            architecture: ${_param:opnfv_maas_node05_architecture}
            distro_series: xenial
            hwe_kernel: hwe-16.04

diff --git a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 0b58bd3..a09c728 100644 (file)
--- a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -160,10 +160,10 @@ index fe3ff14..5d28cfa 100644
 +/usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
 +/usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch
 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 6ed97fb..d8f9087 100644
+index 23f09a7..b28f479 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
-@@ -51,21 +51,33 @@ parameters:
+@@ -48,21 +48,33 @@ parameters:
          openstack.control:
            cpu: 4
            ram: 12288
@@ -197,7 +197,7 @@ index 6ed97fb..d8f9087 100644
            disk_profile: xxlarge
            net_profile: default
          # stacklight.log:
-@@ -86,6 +98,9 @@ parameters:
+@@ -83,6 +95,9 @@ parameters:
          openstack.proxy:
            cpu: 2
            ram: 2048

diff --git a/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch
index 68d114f..ff5cf7c 100644 (file)
--- a/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch
+++ b/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch
@@ -20,7 +20,7 @@ Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 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 431fde6..49310a4 100644
+index 78c4a0a..df23754 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
 @@ -12,8 +12,8 @@ classes:

diff --git a/patches/opnfv-fuel/0014-glusterfs-Use-3.12-for-AArch64.patch b/patches/opnfv-fuel/0014-glusterfs-Use-3.12-for-AArch64.patch
new file mode 100644 (file)
index 0000000..047eb70
--- /dev/null
+++ b/patches/opnfv-fuel/0014-glusterfs-Use-3.12-for-AArch64.patch
@@ -0,0 +1,61 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2017 Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Fri, 15 Dec 2017 19:57:46 +0100
+Subject: [PATCH] glusterfs: Use 3.12 for AArch64
+
+Currently, the glusterfs PPA for 3.13 does not have arm64 binaries,
+so stick to 3.12 for now.
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ 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, 3 insertions(+), 3 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 b28f479..c01143e 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
+@@ -26,7 +26,7 @@ classes:
+ parameters:
+   _param:
+     linux_system_codename: xenial
+-    glusterfs_version: '3.13'
++    glusterfs_version: '3.12'
+     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 df23754..e3db1b0 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
+@@ -35,7 +35,7 @@ parameters:
+     keepalived_vip_virtual_router_id: 69
+     loopback_device_size: 20
+     linux_system_codename: xenial
+-    glusterfs_version: '3.13'
++    glusterfs_version: '3.12'
+   glusterfs:
+     client:
+       volumes:
+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 c332542..7a2288f 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
+@@ -38,7 +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'
++    glusterfs_version: '3.12'
+   nova:
+     controller:
+       pkgs:

diff --git a/upstream/fuel b/upstream/fuel
index 9eb05da..2fc4b88 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit 9eb05da8bc5618e4b95d396fcc932a7c0abb3bd6
+Subproject commit 2fc4b8890ef1ad456ac1ff421f33e005ae0484be