diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-12-08 17:02:37 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-12-08 17:47:56 +0000 |
| commit | fb7a82b9e6fe9d43deac2249ec1ec204e022887e (patch) | |
| tree | 043ec67206a64314cb8a4d2f1b7bc09903c2cfe2 /mcp/config/states/virtual_init | |
| parent | d31dd725050aec640add9203daf7e36588d0f510 (diff) | |
[cfg01] reclass: Apply broken default patch first
reclass settings.py should be patched before the salt-master service
is started (since we can't restart it inside the container without
killing the tini init).
Fixes: 2de5348a
Change-Id: Id62d8f9f12fd72ef60322dd9907f26907231c4a7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 137d0635cc47ae2e0b86c97ee13e93bf2bf94f51)
Diffstat (limited to 'mcp/config/states/virtual_init')
| -rwxr-xr-x | mcp/config/states/virtual_init | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mcp/config/states/virtual_init b/mcp/config/states/virtual_init index e234b7235..46d880471 100755 --- a/mcp/config/states/virtual_init +++ b/mcp/config/states/virtual_init @@ -22,9 +22,6 @@ NODE_MASK="${LOCAL_VIRT_NODES// /|}" wait_for 5.0 "salt-call state.sls reclass,linux.network,salt.minion \ exclude='[{id: reclass_packages}, {id: /etc/reclass/reclass-config.yml}]'" -# Workaround for: https://github.com/salt-formulas/reclass/issues/77 -salt-call file.replace '/usr/local/lib/python2.7/dist-packages/reclass/settings.py' \ - pattern='(ignore_overwritten_missing_references)defaults.' repl='\1' wait_for 3.0 "salt -C 'E@^(${NODE_MASK}).*' saltutil.refresh_pillar" # NOTE: domain name changes are not yet supported without a clean redeploy |