[patch] Drop upstream reclass formula patches

[fuel.git] / mcp / patches / scripts / 0001-salt-master-setup.sh-Allow-arm64-salt-bootstrap.patch

diff --git a/mcp/patches/scripts/0001-salt-master-setup.sh-Allow-arm64-salt-bootstrap.patch b/mcp/patches/scripts/0001-salt-master-setup.sh-Allow-arm64-salt-bootstrap.patch
index 7e995e7..498743b 100644 (file)
--- a/mcp/patches/scripts/0001-salt-master-setup.sh-Allow-arm64-salt-bootstrap.patch
+++ b/mcp/patches/scripts/0001-salt-master-setup.sh-Allow-arm64-salt-bootstrap.patch
@@ -1,3 +1,11 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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, 1 Sep 2017 00:48:26 +0200
 Subject: [PATCH] salt-master-setup.sh: Allow arm64 salt-bootstrap
@@ -18,7 +26,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/salt-master-setup.sh b/salt-master-setup.sh
-index 32a1fea..7454b26 100755
+index cba21fb..0dd3036 100755
 --- a/salt-master-setup.sh
 +++ b/salt-master-setup.sh
 @@ -237,12 +237,12 @@ install_salt_master_pkg()
@@ -35,8 +43,8 @@ index 32a1fea..7454b26 100755
 +          curl -L https://bootstrap.saltstack.com | sed 's@"amd64")@"amd64"|"arm64")@g' | $SUDO sh -s -- -M ${BOOTSTRAP_SALTSTACK_OPTS} &>/dev/null || true
          ;;
      esac
-
-@@ -308,10 +308,10 @@ install_salt_minion_pkg()
+     
+@@ -310,10 +310,10 @@ install_salt_minion_pkg()
 
      case $PLATFORM_FAMILY in
        debian)