diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-12 02:05:50 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-12 17:16:10 +0000 |
| commit | a0a060a131fb8141d0a1210892443caef250b7b5 (patch) | |
| tree | ac1299a86c5e093e0f854475489c148dae0ca520 /mcp/patches | |
| parent | ba9258f711016d9b3799d45f69b38eb815ec8d69 (diff) | |
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 <Alexandru.Avadanii@enea.com>
(cherry picked from commit 1058c7ee35d64f38d978db2b3f840afca2facdef)
Diffstat (limited to 'mcp/patches')
| -rw-r--r-- | mcp/patches/patches.list | 1 | ||||
| -rw-r--r-- | mcp/patches/patches_neutron.list | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index accdb6b09..fb5a14cda 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -5,6 +5,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +/usr/share/salt-formulas/env: 0001-opendaylight-formula-neutron.patch /usr/share/salt-formulas/env: 0002-maas-region-skip-credentials-update.patch /usr/share/salt-formulas/env: 0003-maas-region-force-artifact-download.patch /usr/share/salt-formulas/env: 0004-maas-region-use-authorized_keys-1st-entry.patch diff --git a/mcp/patches/patches_neutron.list b/mcp/patches/patches_neutron.list deleted file mode 100644 index e89bfe70f..000000000 --- a/mcp/patches/patches_neutron.list +++ /dev/null @@ -1,8 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -/usr/share/salt-formulas/env: 0001-opendaylight-formula-neutron.patch |