diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-03 00:59:51 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-02 23:41:30 +0000 |
| commit | c2b84a6b0b9df4a831ffa5f948afacd9fe1bb48a (patch) | |
| tree | d1afa3f0322a66ae09808895d0b7a26ec6985a42 /mcp/scripts | |
| parent | 095e1d85da8eb0bafc2781fb0a902fc426e15b45 (diff) | |
salt.sh: Stick to older salt-formula-neutron
Recent changes to salt-formula-neutron, more precisely [1], broke the
compatibility with our current reclass model [2], which was not
updated to reflect the formula change.
Instead of locally patching the reclass model, install the latest
compatible version of the Neutron formula:
- 2016.12.1+201709251458.f0607d9-1xenial1;
[1] https://github.com/salt-formulas/salt-formula-neutron/commit/
79ffa26858d682f404984175dc1ab93863a149ad
[2] https://github.com/Mirantis/reclass-system-salt-model
Change-Id: Ia1bc9de9a1543f7888688be76ff3513e6b4f062b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit f2b1d6cfe31a451b0608b9a2aadead2dcf4cfabb)
Diffstat (limited to 'mcp/scripts')
| -rwxr-xr-x | mcp/scripts/salt.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 081513c6b..1ea8f5b8e 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -65,4 +65,8 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END salt -C '* and not cfg01*' pkg.upgrade refresh=False salt '*' state.sls ntp + + # Temporary fixup for mismatch between neutron formula and reclass model + salt-call pkg.install salt-formula-neutron allow_updates=False refresh=False \ + version=2016.12.1+201709251458.f0607d9-1xenial1 SALT_INSTALL_END |