diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-31 15:58:25 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-31 16:02:46 +0100 |
| commit | 6eab8c989c257213586347f284362cc43f99d3f4 (patch) | |
| tree | 0e3f94e68795d86340cc8af9358ea6c0ce28fa5c /patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | |
| parent | 648ec98613d31e3d9701b9ac1d87aed640b245f3 (diff) | |
p/fuel: Retry armband state, fail on not connected
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.
Change-Id: I7b4302a89d60c94ab3f58cd6b8523cf668314a05
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 | 4 |
1 files changed, 2 insertions, 2 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 db1d8956..9f91446e 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,14 +41,14 @@ 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 a8bb3b9..7c30515 100755 +index a8bb3b9..2554c5d 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init @@ -26,6 +26,7 @@ salt -C 'kvm*' pkg.install bridge-utils salt -C 'kvm*' state.apply linux.network 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'" |