From 0acee8e72f3670f9886bcc28cac9ef5f7885c6a0 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 19 Feb 2018 02:44:12 +0100 Subject: [salt.sh] Armband extra repo for forked reclass - add Armband nightly/extra DEB repository; - install forked and updated reclass 1.5.2 which includes: * better error reporting; * support for deleting existing keys during list interpolation; * various other improvements and optimizations; While at it, update copyright year for patches. JIRA: FUEL-345 Change-Id: I00d8b625fe191648e7ea34b3dd4c8375691384e6 Signed-off-by: Alexandru Avadanii --- ...aster-setup.sh-Allow-arm64-salt-bootstrap.patch | 2 +- ...t-master-init.sh-Apply-OPNFV-Fuel-patches.patch | 2 +- ...t-master-setup-Group-APT-install-formulas.patch | 68 ---------------------- ...t-master-setup-Group-APT-install-formulas.patch | 68 ++++++++++++++++++++++ 4 files changed, 70 insertions(+), 70 deletions(-) delete mode 100644 mcp/patches/scripts/0002-salt-master-setup-Group-APT-install-formulas.patch create mode 100644 mcp/patches/scripts/0003-salt-master-setup-Group-APT-install-formulas.patch (limited to 'mcp/patches/scripts') 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 8d0c46c92..498743b77 100644 --- 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,5 +1,5 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Mirantis Inc., Enea AB and others. +: 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 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 index 978815020..6c7cbb6e8 100644 --- 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 @@ -1,5 +1,5 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Mirantis Inc., Enea AB and others. +: 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 diff --git a/mcp/patches/scripts/0002-salt-master-setup-Group-APT-install-formulas.patch b/mcp/patches/scripts/0002-salt-master-setup-Group-APT-install-formulas.patch deleted file mode 100644 index 71632681e..000000000 --- a/mcp/patches/scripts/0002-salt-master-setup-Group-APT-install-formulas.patch +++ /dev/null @@ -1,68 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 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 -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 ---- - 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 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 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 new file mode 100644 index 000000000..d5a9bf3c4 --- /dev/null +++ b/mcp/patches/scripts/0003-salt-master-setup-Group-APT-install-formulas.patch @@ -0,0 +1,68 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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 +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 +--- + 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 -- cgit 1.2.3-korg