u/fuel: Bump & rebase for MaaS proxy support

[armband.git] / patches / opnfv-fuel / 0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch

diff --git a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index 1ea8f5a..5223635 100644 (file)
--- a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
@@ -33,22 +33,22 @@ to pick up the changes, so we'll run it before rebooting kvm nodes.
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- mcp/config/states/virtual_control_plane            |   1 +
+ mcp/config/states/baremetal_init                   |   1 +
  .../armband/files/salt-minion-aarch64-rollup.diff  | 101 +++++++++++++++++++++
  mcp/salt-formulas/armband/salt_minion.sls          |   7 ++
  3 files changed, 109 insertions(+)
  create mode 100644 mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff
  create mode 100644 mcp/salt-formulas/armband/salt_minion.sls
 
-diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 99fb517..88a4488 100755
---- a/mcp/config/states/virtual_control_plane
-+++ b/mcp/config/states/virtual_control_plane
-@@ -40,6 +40,7 @@ salt -C 'kvm*' pkg.install bridge-utils
- salt -C 'kvm*' state.apply linux.network
+diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
+index eeb0818..2b6666d 100755
+--- a/mcp/config/states/baremetal_init
++++ b/mcp/config/states/baremetal_init
+@@ -28,6 +28,7 @@ salt -C 'kvm* or cmp*' state.apply salt.minion
+ salt -C 'kvm* or cmp*' service.force_reload salt-minion
  salt -C 'cmp*' state.apply linux.system
  salt -C 'cmp*' state.apply linux.network || true
-+salt -C 'kvm*' state.apply armband.salt_minion || true
++salt -C 'kvm*' state.apply armband.salt_minion
  salt -C 'kvm* or cmp*' system.reboot
  wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
    "tee /dev/stderr | grep -Fq 'Not connected'"