diff options
| author |   Justin chi <chigang@huawei.com> | 2018-05-22 12:32:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-05-22 12:32:43 +0000 |
| commit | c9bd8b778c698a9fd39764fa0f4275614ecee5a8 (patch) | |
| tree | b576b629f0b4f8383e645ed45530802a3173e6e0 /deploy/compass_conf | |
| parent | e0cc095b31e0285fe318863704b0916a8f88e17d (diff) | |
| parent | 7f0439ac27821dbaacda757bde56b3e53f27785c (diff) | |
Merge "enable http_proxy in kargo"
Diffstat (limited to 'deploy/compass_conf')
| -rw-r--r-- | deploy/compass_conf/templates/ansible_installer/kubernetes/vars/ansible-kubernetes.tmpl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/deploy/compass_conf/templates/ansible_installer/kubernetes/vars/ansible-kubernetes.tmpl b/deploy/compass_conf/templates/ansible_installer/kubernetes/vars/ansible-kubernetes.tmpl index 0d529561..669eaca0 100644 --- a/deploy/compass_conf/templates/ansible_installer/kubernetes/vars/ansible-kubernetes.tmpl +++ b/deploy/compass_conf/templates/ansible_installer/kubernetes/vars/ansible-kubernetes.tmpl @@ -45,6 +45,10 @@ external_cidr: "{{ ip_settings[inventory_hostname]['external']['cidr'] }}" public_net_info: "{{ network_cfg.public_net_info }}" host_ip_settings: "{{ ip_settings[inventory_hostname] }}" +proxy: $getVar('http_proxy', '') +#set no_proxy = ','.join($getVar('no_proxy', [])) +ignore_proxy: $no_proxy + ntp_server: $ntp_server internal_vip: ip: $network_cfg["internal_vip"]["ip"] |