[fix] Permanently set proxy for yum using template

This commit is contained in:
William Wernert
2021-03-04 16:40:32 -05:00
parent b3c7760ad4
commit e0d0baafcc
2 changed files with 3 additions and 1 deletions

View File

@@ -14,4 +14,6 @@ clean_requirements_on_remove=1
{% if (grains['role'] not in ['so-eval','so-managersearch', 'so-manager', 'so-standalone']) and salt['pillar.get']('global:managerupdate', '0') %}
proxy=http://{{ salt['pillar.get']('yum:config:proxy', salt['config.get']('master')) }}:3142
{% elif salt['pillar.get']('manager:proxy') is not None %}
proxy={{salt['pillar.get']('manager:proxy')}}
{% endif %}

View File

@@ -1481,6 +1481,7 @@ manager_pillar() {
"manager:"\
" mainip: '$MAINIP'"\
" mainint: '$MNIC'"\
" proxy: '$so_proxy'"\
" esheap: '$ES_HEAP_SIZE'"\
" esclustername: '{{ grains.host }}'"\
" freq: 0"\
@@ -1560,7 +1561,6 @@ manager_global() {
" hnmanager: '$HNMANAGER'"\
" ntpserver: '$NTPSERVER'"\
" dockernet: '$DOCKERNET'"\
" proxy: '$so_proxy'"\
" mdengine: '$ZEEKVERSION'"\
" ids: '$NIDS'"\
" url_base: '$REDIRECTIT'"\