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:06:32 +0100 |
commit | 137d0635cc47ae2e0b86c97ee13e93bf2bf94f51 (patch) | |
tree | 2cf13a5b75b6a228a2c69a5dd23f07264e731ce2 /mcp/config/states | |
parent | 2de5348a8b267a1742154dd6d5c4f5bd3a2983ab (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>
Diffstat (limited to 'mcp/config/states')
-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 |