aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-24 17:10:33 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-24 17:11:05 +0200
commit8d0731eecbb4c7f78e23c8a7e93004da7593afbe (patch)
tree3cd9b7079a159801ba072f4f26056bd09b6283b9 /patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch
parentaa6c72b42783a4226c07e0b7af37434f13dc8c64 (diff)
p/fuel: Rebase after MaaS retry got upstream
Change-Id: I321fcb4aa77ebcb4595a9468c2257fef8b9a8ed6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch')
-rw-r--r--patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch b/patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch
index dc8993f..154b824 100644
--- a/patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch
+++ b/patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch
@@ -24,16 +24,16 @@ 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/maas b/mcp/config/states/maas
-index 9fe7de0..0cf4f68 100755
+index fcb8ce3..12ef9ed 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
-@@ -46,6 +46,7 @@ salt -C '* and not cfg01* and not mas01*' saltutil.sync_all
+@@ -76,6 +76,7 @@ salt -C '* and not cfg01* and not mas01*' saltutil.sync_all
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 "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'"
+ wait_for 90 "! salt '*' test.ping | tee /dev/stderr | fgrep -q '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