From 1058c7ee35d64f38d978db2b3f840afca2facdef 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 --- .../classes/cluster/baremetal-mcp-ocata-common/infra/config.yml | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml index e0f9a2a94..275941120 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml @@ -47,6 +47,15 @@ parameters: master: accept_policy: open_mode file_recv: true + environment: + prd: + formula: + maas: + # Temporary fixup for MaaS formula machine status int.lower() + version: 0.0.1+201711061044.9f1b034~xenial1 + neutron: + # Temporary fixup for mismatch between formula and reclass model + version: 2016.12.1+201709251458.f0607d9-1xenial1 reclass: storage: data_source: -- cgit 1.2.3-korg