From a0a060a131fb8141d0a1210892443caef250b7b5 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 12 Nov 2017 02:05:50 +0100 Subject: salt formulas: Pin via reclass instead of salt.sh Previous commit pinned the salt-formula-package by installing a specific version after OPNFV-specific patches were applied by `patch.sh`. To prevent patch bypass, move the pin to reclass model. While at it, also move salt-formula-neutron pinning to reclass to bypass wrong minimum length of 2 for version-pinned formula pkgs. Change-Id: I35c2773c130d79ec919685cd771311d6c11e11a8 Signed-off-by: Alexandru Avadanii (cherry picked from commit 1058c7ee35d64f38d978db2b3f840afca2facdef) --- mcp/scripts/salt.sh | 8 -------- 1 file changed, 8 deletions(-) (limited to 'mcp/scripts') diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 2db992fe5..a03d25fc4 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -69,12 +69,4 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << 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 - # Temporary fixup for MaaS formula machine status int.lower() - salt-call pkg.install salt-formula-maas allow_updates=False refresh=False \ - version=0.0.1+201711061044.9f1b034~xenial1 - cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches_neutron.list formulas SALT_INSTALL_END -- cgit 1.2.3-korg