mcp/patches/scripts/0002-salt-master-init.sh-Apply-OPNFV-Fuel-patches.patch

   1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   2 : Copyright (c) 2018 Mirantis Inc., Enea AB and others.
   3 :
   4 : All rights reserved. This program and the accompanying materials
   5 : are made available under the terms of the Apache License, Version 2.0
   6 : which accompanies this distribution, and is available at
   7 : http://www.apache.org/licenses/LICENSE-2.0
   8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   9 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  10 Date: Fri, 8 Dec 2017 20:30:46 +0100
  11 Subject: [PATCH] salt-master-init.sh: Apply OPNFV Fuel patches
  12
  13 Some of Fuel@OPNFV patches need to be applied before the reclass
  14 storage.node state is ran for Salt Master, i.e. between installing
  15 salt-formula-* packages and configuring the Salt Master salt services.
  16
  17 JIRA: FUEL-310
  18
  19 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  20 ---
  21  salt-master-init.sh | 1 +
  22  1 file changed, 1 insertion(+)
  23
  24 diff --git a/salt-master-init.sh b/salt-master-init.sh
  25 index 343324c..a4ec138 100755
  26 --- a/salt-master-init.sh
  27 +++ b/salt-master-init.sh
  28 @@ -284,6 +284,7 @@ options
  29      system_config
  30
  31      saltmaster_bootstrap &&\
  32 +    /root/fuel/mcp/patches/patch.sh /root/fuel/mcp/patches/patches_init.list formulas &&\
  33      saltmaster_init &&\
  34
  35      verify_salt_minions