summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-12 02:05:50 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-12 02:35:58 +0100
commit1058c7ee35d64f38d978db2b3f840afca2facdef (patch)
treecf82edf8f1c098296c4fd09a9065c615780461fa
parentc4b87dbc189e2a2f4d586d41ef5db2166c42231d (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>
-rw-r--r--mcp/patches/patches.list1
-rw-r--r--mcp/patches/patches_neutron.list8
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml9
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml9
-rwxr-xr-xmcp/scripts/salt.sh8
5 files changed, 19 insertions, 16 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
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:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
index 3c3d5260a..21ed8d329 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
@@ -43,6 +43,15 @@ parameters:
salt:
master:
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:
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