diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-08 16:59:11 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-08 17:21:27 +0100 |
| commit | 91d249e3087014902930e2475facd40077d3aedd (patch) | |
| tree | ca1f4bf204e9b058b7dbb81a2ae8154903a0370f /patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | |
| parent | 22f9c97db5345d47768ae0552f9f175a5b3356ce (diff) | |
u/fuel: Bump & rebase for Ubuntu `modprobe -f` fix
Squash in additional changes:
- p/fuel: Retry armband state, fail on not connected
- 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.
We no longer expect the armband state to fail on any nodes,
baremetal or virtual, kvm or cmp, so remove failsafe `|| true`
and retry state apply in case minions did not repond.
JIRA: ARMBAND-350
Change-Id: I7b4302a89d60c94ab3f58cd6b8523cf668314a05
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commmit 6eab8c989c257213586347f284362cc43f99d3f4)
(cherry picked from commmit 29c39fd5a8fc8a4bb058b5c18a6c1d6a29544f4f)
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 | 8 |
1 files changed, 4 insertions, 4 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 b6443988..7772c2f4 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,17 +41,17 @@ 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 5674e62..121dc8d 100755 +index 5a8cb49..c963e59 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 salt -C 'kvm* or cmp*' service.force_reload salt-minion salt -C 'cmp*' state.apply linux.system salt -C 'cmp*' state.apply linux.network || true -+salt -C 'kvm*' state.apply armband.salt_minion || 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 |