diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-13 23:28:38 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-15 01:10:12 +0000 |
| commit | 6e71b19097781a7190bcec015afc62be7961fa43 (patch) | |
| tree | 4c0dce6536ffa7090f10af75aabcea0de16efffc /patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch | |
| parent | 956d1d0056c54fe4c886126dcf489b547b01d49a (diff) | |
u/fuel: Bump & rebase for VCP state split
Change-Id: I6f0367d75ea831de78ced480ea73d1cd10680b80
(cherry picked from commit 11143873e70e65d07d73617b8af29a07adffc1aa)
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 | 16 |
1 files changed, 8 insertions, 8 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 1f4d0e85..bb1443d3 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 @@ -24,24 +24,24 @@ 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/maas | 1 + + mcp/config/states/virtual_control_plane | 1 + .../armband/bootstrap_script_arm64.sls | 4 +++ mcp/salt-formulas/armband/files/cloud.py.diff | 29 ++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 mcp/salt-formulas/armband/bootstrap_script_arm64.sls create mode 100644 mcp/salt-formulas/armband/files/cloud.py.diff -diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index baa9b13..68390c0 100755 ---- a/mcp/config/states/maas -+++ b/mcp/config/states/maas -@@ -85,6 +85,7 @@ salt -C '* and not cfg01* and not mas01*' saltutil.sync_all - +diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane +index 327b159..59424ac 100755 +--- a/mcp/config/states/virtual_control_plane ++++ b/mcp/config/states/virtual_control_plane +@@ -7,6 +7,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" + # KVM, compute node prereqs (libvirt first), VCP deployment 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 | fgrep -q 'Not connected'" + wait_for 90 "! salt 'kvm*' 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 |