aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-19 05:49:46 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-19 05:50:43 +0200
commitcdff247b728bd6d00ce7ed7f6994fd0688304fc1 (patch)
tree7234b608c8d255e17c77723980c935fa38c7172e /patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch
parentb7d537303fa171c642025f5c53ed381fd6cb7c3d (diff)
u/fuel: Bump & rebase for cmp network fix
Change-Id: I2d445a78ee6d25b826afe3c42d433b9c4af3d09d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch')
-rw-r--r--patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch b/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch
index a9e65337..852d9999 100644
--- a/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch
+++ b/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch
@@ -32,13 +32,13 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
create mode 100644 mcp/salt-formulas/armband/files/cloud.py.diff
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index fe84222..75386a7 100755
+index 68b4f2f..54cd1f4 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -16,6 +16,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
- salt -C 'kvm*' pkg.install bridge-utils
+@@ -17,6 +17,7 @@ salt -C 'kvm*' pkg.install bridge-utils
salt -C 'kvm*' state.apply linux.network
salt -C 'cmp*' state.apply linux.system
+ salt -C 'cmp*' state.apply linux.network || true
+salt -C 'kvm*' state.apply armband.bootstrap_script_arm64 || true
salt -C 'kvm* or cmp*' system.reboot
wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \