diff options
author | 2018-06-04 15:57:06 +0000 | |
---|---|---|
committer | 2018-06-04 15:57:06 +0000 | |
commit | 05ee61db7286648062a4acec3c665192504c8464 (patch) | |
tree | 6d0bde99f8988d566a9d2b3bfd601a67cc071ad8 /mcp/patches/scripts/0002-salt-master-init.sh-Apply-OPNFV-Fuel-patches.patch | |
parent | 9d0cc8d93c6d9a90062e5418f739b7e53e25a039 (diff) | |
parent | f0819335628c5cf2bcb812291bb502b438866ae0 (diff) |
Merge "[patch] Drop upstream reclass formula patches" into stable/fraser
Diffstat (limited to 'mcp/patches/scripts/0002-salt-master-init.sh-Apply-OPNFV-Fuel-patches.patch')
-rw-r--r-- | mcp/patches/scripts/0002-salt-master-init.sh-Apply-OPNFV-Fuel-patches.patch | 35 |
1 files changed, 0 insertions, 35 deletions
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 <Alexandru.Avadanii@enea.com> -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 <Alexandru.Avadanii@enea.com> ---- - 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 |