diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-07 22:11:04 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-07 22:19:48 +0100 |
| commit | 29c39fd5a8fc8a4bb058b5c18a6c1d6a29544f4f (patch) | |
| tree | eea6009511d53ae4d62c9ad533e94140a7c689b6 /patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | |
| parent | daf95f3b779db56222be35e04610bac83a53575a (diff) | |
u/fuel: Bump & rebase for wait_for changes
While at it, catch armband state minion timeout (not connected or no
response) and reduce armband state retry from 10 to 5.
JIRA: ARMBAND-350
Change-Id: Ifd63c401f44e7ae51f50c5739cf1a20b5d27d287
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch')
| -rw-r--r-- | patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 52236358..92ea8af7 100644 --- 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 @@ -41,7 +41,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> create mode 100644 mcp/salt-formulas/armband/salt_minion.sls diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init -index eeb0818..2b6666d 100755 +index ef2f78b..771182c 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 @@ -50,8 +50,8 @@ index eeb0818..2b6666d 100755 salt -C 'cmp*' state.apply linux.network || 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'" + wait_for 90.0 "salt -C 'kvm* or cmp*' test.ping" + diff --git a/mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff b/mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff new file mode 100644 index 0000000..9e74c24 |