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/scripts/docker-compose | |
| 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/scripts/docker-compose')
| -rwxr-xr-x | mcp/scripts/docker-compose/files/entrypoint.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mcp/scripts/docker-compose/files/entrypoint.sh b/mcp/scripts/docker-compose/files/entrypoint.sh index 9bf3cfc3f..0199c3901 100755 --- a/mcp/scripts/docker-compose/files/entrypoint.sh +++ b/mcp/scripts/docker-compose/files/entrypoint.sh @@ -74,6 +74,10 @@ sed -i -e "s|return 'start/running' in |return 'is running' in |" \ -e "s|ret = _default_runlevel|return _default_runlevel|" \ /usr/lib/python2.7/dist-packages/salt/modules/upstart.py +# Workaround for: https://github.com/salt-formulas/reclass/issues/77 +sed -i -e 's|\(ignore_overwritten_missing_references\)defaults.|\1|' \ + /usr/local/lib/python2.7/dist-packages/reclass/settings.py + # Remove broken symlinks in /srv/salt, silences recurring warnings find -L /srv/salt /srv/salt/env/prd/_* -maxdepth 1 -type l -delete |