summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules4
m---------mcp/deploy/scripts0
-rw-r--r--mcp/patches/scripts/0001-salt-master-setup-Group-APT-install-formulas.patch68
3 files changed, 0 insertions, 72 deletions
diff --git a/.gitmodules b/.gitmodules
index 767cf14df..41594c505 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,10 +2,6 @@
path = mcp/reclass/classes/system
url = https://github.com/Mirantis/reclass-system-salt-model
branch = master
-[submodule "scripts"]
- path = mcp/deploy/scripts
- url = https://github.com/salt-formulas/salt-formulas-scripts
- branch = master
[submodule "pharos"]
path = mcp/scripts/pharos
url = https://github.com/opnfv/pharos
diff --git a/mcp/deploy/scripts b/mcp/deploy/scripts
deleted file mode 160000
-Subproject 4c9818260372459977be1cc4a3869b871ddba0a
diff --git a/mcp/patches/scripts/0001-salt-master-setup-Group-APT-install-formulas.patch b/mcp/patches/scripts/0001-salt-master-setup-Group-APT-install-formulas.patch
deleted file mode 100644
index 9106a13b7..000000000
--- a/mcp/patches/scripts/0001-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 343324c..48a05b9 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 cba21fb..c2decde 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