From d99a846e0aaa5b3de1bc2328a45fb4694fe3f1cf Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 26 Jan 2018 00:31:17 +0100 Subject: [cfg01] apt.conf.d: Dpkg::Use-Pty: 0 This will silence all 'Reading database ...' noise during Salt formula installation. Change-Id: I734d727194e276443db1e1581f40ec494562196e Signed-off-by: Alexandru Avadanii (cherry picked from commit 80212433352a59be69f7c82bce8c297bca13eeaf) --- .../0011-system.repo-Debian-Add-keyserver-proxy-support.patch | 8 ++++++++ mcp/scripts/salt.sh | 1 + 2 files changed, 9 insertions(+) diff --git a/mcp/patches/0011-system.repo-Debian-Add-keyserver-proxy-support.patch b/mcp/patches/0011-system.repo-Debian-Add-keyserver-proxy-support.patch index 1ff519e84..fdf84dcd1 100644 --- a/mcp/patches/0011-system.repo-Debian-Add-keyserver-proxy-support.patch +++ b/mcp/patches/0011-system.repo-Debian-Add-keyserver-proxy-support.patch @@ -1,3 +1,11 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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: Mon, 22 Jan 2018 00:28:09 +0100 Subject: [PATCH] system.repo: Debian: Add keyserver proxy support diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 72c050285..0d0b80994 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -70,6 +70,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END cd /srv/salt/scripts export DEBIAN_FRONTEND=noninteractive + echo 'Dpkg::Use-Pty "0";' > /etc/apt/apt.conf.d/90silence-dpkg OLD_DOMAIN=\$(grep -Pzo "id: cfg01\.\K(\S*)" /etc/salt/minion.d/minion.conf) || true BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.11 " \ MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=2017.12 \ -- cgit 1.2.3-korg