diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-17 16:06:14 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-18 15:42:49 +0200 |
| commit | e68b725920bd313df0ca65a77b27c8de6a6e2937 (patch) | |
| tree | 00918488e6d85e14ffdc6452f6ad1b73db9b079a /patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | |
| parent | d4dd2e997a4af3ed0dfc74dfb964e07ed7225d05 (diff) | |
u/fuel: Bump & rebase for state break & retry
While at it, return true for all armband states that apply patches
which are also providing a post-patching file hash.
Change-Id: I303a2e142a8a9925f6630b53891ddc7bb0399453
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch')
| -rw-r--r-- | patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index 3db98f5d..7c188244 100644 --- a/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -21,24 +21,23 @@ specific values. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - mcp/config/states/virtual_control_plane | 2 +- + mcp/config/states/virtual_control_plane | 1 + .../armband/files/libvirt_domain.jinja.diff | 46 ++++++++++++++++++++++ .../armband/libvirt_domain_template.sls | 4 ++ - 3 files changed, 51 insertions(+), 1 deletion(-) + 3 files changed, 51 insertions(+) create mode 100644 mcp/salt-formulas/armband/files/libvirt_domain.jinja.diff create mode 100644 mcp/salt-formulas/armband/libvirt_domain_template.sls diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index c645ffd..fb47893 100755 +index 602eab2..fe84222 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -18,7 +18,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected - +@@ -23,6 +23,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp --salt -C 'kvm*' state.sls armband -+salt -C 'kvm*' state.sls armband,armband.libvirt_domain_template - salt -C 'kvm*' state.sls libvirt + salt -C 'kvm*' state.sls armband || true ++salt -C 'kvm*' state.sls armband.libvirt_domain_template || true + wait_for 5 "salt -C 'kvm*' state.sls libvirt" salt -C '* and not cfg01* and not mas01*' state.apply salt diff --git a/mcp/salt-formulas/armband/files/libvirt_domain.jinja.diff b/mcp/salt-formulas/armband/files/libvirt_domain.jinja.diff |