u/fuel: Bump & rebase for galera formula pinning

JIRA: ARMBAND-328

Change-Id: I5f284be5e75dc5ea740e632efc6f6c2e46de3973
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 9848bc05e89f2399f1958624055173142b6107d4)

6 files changed, 3 insertions, 63 deletions

diff --git a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
index c8d9305a..e6e09bfc 100644
--- a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
@@ -58,7 +58,7 @@ index 19cd417..73983d2 100755
 +
 +salt -I 'nova:compute' state.sls armband || true
 diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index 89733cc..f1479ef 100755
+index 9237cc0..17421a9 100755
 --- a/mcp/config/states/openstack_ha
 +++ b/mcp/config/states/openstack_ha
 @@ -52,6 +52,7 @@ salt -I 'neutron:server' state.sls neutron -b 1
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 aa0b9f97..59f7a609 100644
--- 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,7 +160,7 @@ index e355700..b2745a1 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-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
-index 757295a..fe17fa6 100644
+index d098fa6..d88512e 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
 @@ -42,21 +42,33 @@ parameters:
@@ -205,7 +205,7 @@ index 757295a..fe17fa6 100644
 +          virt_machine_model: virt
 +          cpu_model: host-passthrough
            disk_profile: small
-           net_profile: default
+           net_profile: default_ext
        cluster:
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
 index d7bbadd..f8b9662 100644
diff --git a/patches/opnfv-fuel/0012-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch
index 684f45cb..684f45cb 100644
--- a/patches/opnfv-fuel/0012-aarch64-skip-configuration-of-hugepages.patch
+++ b/patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch
diff --git a/patches/opnfv-fuel/0011-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch b/patches/opnfv-fuel/0011-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
deleted file mode 100644
index 01e3f954..00000000
--- a/patches/opnfv-fuel/0011-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: 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: Thu, 24 Aug 2017 04:09:59 +0200
-Subject: [PATCH] lib.sh: rm Ubuntu boot entry on EFI systems
-
-On EFI-enabled systems, grub-install from grub-efi-* package
-installs a boot entry named "ubuntu".
-
-MaaS relies on IPMI to set boot order to PXE first; however
-on systems with buggy firmware or without full IPMI support,
-that fails, leading to booting Ubuntu from hard disk instead.
-
-Work around this by clearing any previous Ubuntu boot entry
-from board flash, before starting a new baremetal deploy.
-
-NOTE: This only runs against nodes that are online from a
-previous deploy.
-
-Closes: ARMBAND-47
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- mcp/scripts/lib.sh | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
-index a165bb3..bfde237 100644
---- a/mcp/scripts/lib.sh
-+++ b/mcp/scripts/lib.sh
-@@ -35,6 +35,15 @@ function get_base_image {
-   wget -P "${image_dir}" -N "${base_image}"
- }
-
-+function cleanup_uefi {
-+  # Clean up Ubuntu boot entry if cfg01, kvm nodes online from previous deploy
-+  # shellcheck disable=SC2086
-+  ssh ${SSH_OPTS} "${SSH_SALT}" "sudo salt -C 'kvm* or cmp*' cmd.run \
-+    \"which efibootmgr > /dev/null 2>&1 && \
-+    efibootmgr | grep -oP '(?<=Boot)[0-9]+(?=.*ubuntu)' | \
-+    xargs -I{} efibootmgr --delete-bootnum --bootnum {}\"" || true
-+}
-+
- function cleanup_vms {
-   # clean up existing nodes
-   for node in $(virsh list --name | grep -P '\w{3}\d{2}'); do
-@@ -52,6 +61,7 @@ function prepare_vms {
-   local base_image=$2
-   local image_dir=$3
-
-+  cleanup_uefi
-   cleanup_vms
-   get_base_image "${base_image}" "${image_dir}"
-   # shellcheck disable=SC2016
diff --git a/patches/opnfv-fuel/0013-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0012-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
index 15c1c19f..15c1c19f 100644
--- a/patches/opnfv-fuel/0013-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
+++ b/patches/opnfv-fuel/0012-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
diff --git a/patches/opnfv-fuel/0014-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch
index 75e239a0..75e239a0 100644
--- a/patches/opnfv-fuel/0014-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch