From f0819335628c5cf2bcb812291bb502b438866ae0 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 4 Jun 2018 14:11:08 +0200 Subject: [patch] Drop upstream reclass formula patches Change-Id: Iad2a27d059b43ed14fb70bdee01b3db29613615b Signed-off-by: Alexandru Avadanii (cherry picked from commit 28ccbe4f37cf8b2e38681d4a732f80112888ce84) --- ...t-master-init.sh-Apply-OPNFV-Fuel-patches.patch | 35 ---------------------- 1 file changed, 35 deletions(-) delete mode 100644 mcp/patches/scripts/0002-salt-master-init.sh-Apply-OPNFV-Fuel-patches.patch (limited to 'mcp/patches/scripts/0002-salt-master-init.sh-Apply-OPNFV-Fuel-patches.patch') diff --git a/mcp/patches/scripts/0002-salt-master-init.sh-Apply-OPNFV-Fuel-patches.patch b/mcp/patches/scripts/0002-salt-master-init.sh-Apply-OPNFV-Fuel-patches.patch deleted file mode 100644 index 6c7cbb6e8..000000000 --- a/mcp/patches/scripts/0002-salt-master-init.sh-Apply-OPNFV-Fuel-patches.patch +++ /dev/null @@ -1,35 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2018 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 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii -Date: Fri, 8 Dec 2017 20:30:46 +0100 -Subject: [PATCH] salt-master-init.sh: Apply OPNFV Fuel patches - -Some of Fuel@OPNFV patches need to be applied before the reclass -storage.node state is ran for Salt Master, i.e. between installing -salt-formula-* packages and configuring the Salt Master salt services. - -JIRA: FUEL-310 - -Signed-off-by: Alexandru Avadanii ---- - salt-master-init.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/salt-master-init.sh b/salt-master-init.sh -index 343324c..a4ec138 100755 ---- a/salt-master-init.sh -+++ b/salt-master-init.sh -@@ -284,6 +284,7 @@ options - system_config - - saltmaster_bootstrap &&\ -+ /root/fuel/mcp/patches/patch.sh /root/fuel/mcp/patches/patches_init.list formulas &&\ - saltmaster_init &&\ - - verify_salt_minions -- cgit 1.2.3-korg