diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-22 02:10:03 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-22 03:07:25 +0100 |
| commit | ba3d7527637414175f5a142fa92cd9ea5d2e3158 (patch) | |
| tree | f7c0bc3bc1be805fb456c5c527bf8393b40cb24d /mcp/config/states | |
| parent | 2d347e8fd382bbb99c9747328e41734b331f745c (diff) | |
[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 <Alexandru.Avadanii@enea.com>
(cherry picked from commit 6ab6935577900e598ca60aaed14d2e73f7b1633f)
Diffstat (limited to 'mcp/config/states')
| -rwxr-xr-x | mcp/config/states/baremetal_init | 1 | ||||
| -rwxr-xr-x | mcp/config/states/virtual_control_plane | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init index 1d3820192..5a8b6c75a 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init @@ -25,7 +25,6 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ salt -C 'kvm*' pkg.install bridge-utils salt -C 'kvm*' state.apply linux.network salt -C 'kvm* or cmp*' state.apply salt.minion -salt -C 'kvm* or cmp*' service.force_reload salt-minion salt -C 'cmp*' state.apply linux.system salt -C 'cmp*' state.apply linux.network || true 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} \ |