From ba3d7527637414175f5a142fa92cd9ea5d2e3158 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 22 Jan 2018 02:10:03 +0100 Subject: [patch] system.repo: Add keyserver proxy support Instead of defining a http proxy for all salt-minion traffic, which also includes some Openstack API accesses we can't filter (no_proxy is not yet supported), add & leverage support for proxy configuration during APT keyserver access / key download. JIRA: FUEL-331 Change-Id: I9470807633596c610cfafb141b139ddda2ff096b Signed-off-by: Alexandru Avadanii (cherry picked from commit 6ab6935577900e598ca60aaed14d2e73f7b1633f) --- mcp/config/states/virtual_control_plane | 1 - 1 file changed, 1 deletion(-) (limited to 'mcp/config/states/virtual_control_plane') diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index 33cc9dce5..9a77c764d 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -59,7 +59,6 @@ salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' cp.get_file \ "salt://maas/files/$(basename "${APT_CONF_D_CURTIN}")" "${APT_CONF_D_CURTIN}" wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply salt" -wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' service.force_reload salt-minion" wait_for 10.0 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp" wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \ -- cgit 1.2.3-korg