diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-01-29 09:29:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-29 09:29:02 +0000 |
| commit | c5e54b7cd6e45657fdde0e456fdebff23489bb5a (patch) | |
| tree | df41cb1511a2f90a60665aa9b848c964429cac14 | |
| parent | 8bb7aa853357117649441946ed1553d907b37871 (diff) | |
| parent | 80212433352a59be69f7c82bce8c297bca13eeaf (diff) | |
Merge "[cfg01] apt.conf.d: Dpkg::Use-Pty: 0"
| -rw-r--r-- | mcp/patches/0011-system.repo-Debian-Add-keyserver-proxy-support.patch | 8 | ||||
| -rwxr-xr-x | mcp/scripts/salt.sh | 1 |
2 files changed, 9 insertions, 0 deletions
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 <Alexandru.Avadanii@enea.com> 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 1975f9e54..547137afe 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=stable \ |