diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-18 16:24:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-18 16:24:37 +0000 |
| commit | 8749d6cade0b3892ea57583ee54b3bf72bdd91f8 (patch) | |
| tree | 002fb62791e4b048670fcf96f073c142abe60158 /patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch | |
| parent | 41fd911de4f0c302f44c9a3af12aebc852dfffc8 (diff) | |
| parent | e68b725920bd313df0ca65a77b27c8de6a6e2937 (diff) | |
Merge "u/fuel: Bump & rebase for state break & retry"
Diffstat (limited to 'patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch')
| -rw-r--r-- | patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch b/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch index 988b8fc8..a9e65337 100644 --- a/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch +++ b/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch @@ -32,17 +32,17 @@ 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 fb47893..899972c 100755 +index fe84222..75386a7 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -13,6 +13,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" - # KVM, compute node prereqs (libvirt first), VCP deployment +@@ -16,6 +16,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" salt -C 'kvm*' pkg.install bridge-utils salt -C 'kvm*' state.apply linux.network -+salt -C 'kvm*' state.apply armband.bootstrap_script_arm64 - salt -C 'kvm*' system.reboot - wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected'" - + salt -C 'cmp*' state.apply linux.system ++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 | " \ + "tee /dev/stderr | grep -Fq 'Not connected'" diff --git a/mcp/salt-formulas/armband/bootstrap_script_arm64.sls b/mcp/salt-formulas/armband/bootstrap_script_arm64.sls new file mode 100644 index 0000000..845dedd |