[scripts] Leverage upstream arm64 bootstrap supp

bootstrap-salt.sh now has arm64 support [1], so drop our obsoleted
workaround.

JIRA: ARMBAND-399

[1] https://github.com/saltstack/salt-bootstrap/pull/1251

Change-Id: I8b06520b2c41564ed2eda338e7633ce1637bb866
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

1 files changed, 0 insertions, 68 deletions

diff --git a/mcp/patches/scripts/0003-salt-master-setup-Group-APT-install-formulas.patch b/mcp/patches/scripts/0003-salt-master-setup-Group-APT-install-formulas.patch
deleted file mode 100644
index d5a9bf3c4..000000000
--- a/mcp/patches/scripts/0003-salt-master-setup-Group-APT-install-formulas.patch
+++ /dev/null
@@ -1,68 +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: Tue, 30 Jan 2018 01:23:54 +0100
-Subject: [PATCH] salt-master-setup: Group APT install formulas
-
-Instead of calling `apt install` for each salt formula package that
-we miss, construct a list and install them all at once.
-
-While at it, disable colored output on terminals that don't support
-it, like vt220 (used in OPNFV CI).
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- salt-master-init.sh  |  6 ++++++
- salt-master-setup.sh | 12 +++++++-----
- 2 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/salt-master-init.sh b/salt-master-init.sh
-index a4ec138..db90a22 100755
---- a/salt-master-init.sh
-+++ b/salt-master-init.sh
-@@ -24,6 +24,12 @@ options() {
-       export $(find $path -maxdepth 1 -name '*.env' 2> /dev/null | xargs --no-run-if-empty cat ) > /dev/null
-     done;
-
-+    # If terminal does not support color output, stop using it
-+    if ! tput setaf 1 && tput sgr0; then
-+        SALT_OPTS="${SALT_OPTS/--force-color/--no-color}"
-+        return 0
-+    fi
-+
-     export MAGENTA='\033[0;95m'
-     export YELLOW='\033[1;33m'
-     export BLUE='\033[0;35m'
-diff --git a/salt-master-setup.sh b/salt-master-setup.sh
-index 0dd3036..a0c6311 100755
---- a/salt-master-setup.sh
-+++ b/salt-master-setup.sh
-@@ -347,15 +347,17 @@ install_salt_formula_pkg()
-           # Set essentials if FORMULAS_SALT_MASTER is not defined at all
-           [ -z ${FORMULAS_SALT_MASTER+x} ] && declare -a FORMULAS_SALT_MASTER=("linux" "reclass" "salt" "memcached")
-           for formula_service in "${FORMULAS_SALT_MASTER[@]}"; do
--              echo -e "\nConfiguring salt formula ${formula_service} ...\n"
-+              echo -e "Configuring salt formula ${formula_service} ..."
-               [ ! -d "${FORMULAS_PATH}/env/${formula_service}" ] && \
--                  if ! $SUDO apt-get install -y salt-formula-${formula_service}; then
--                    echo -e "\nInstall salt-formula-${formula_service} failed.\n"
--                    exit 1
--                  fi
-+                  _FORMULAS_SALT_MASTER="${_FORMULAS_SALT_MASTER} salt-formula-${formula_service}"
-+              # Create links first, install pkgs later
-               [ ! -L "/srv/salt/reclass/classes/service/${formula_service}" ] && \
-                   ln -sf ${FORMULAS_PATH}/reclass/service/${formula_service} /srv/salt/reclass/classes/service/${formula_service}
-           done
-+          if ! $SUDO apt-get install -qqq -y ${_FORMULAS_SALT_MASTER}; then
-+            echo -e "\nInstall ${_FORMULAS_SALT_MASTER} failed.\n"
-+            exit 1
-+          fi
-         ;;
-       rhel)
-         # TODO