aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/compass_conf/templates
diff options
context:
space:
mode:
authorzhichaozhu <zhichao.zhu8@gmail.com>2018-04-25 12:37:45 +0800
committerwutianwei <wutianwei1@huawei.com>2018-05-08 12:40:56 +0000
commit7f0439ac27821dbaacda757bde56b3e53f27785c (patch)
tree867c5340ee827831e06e5994d0d046c3628e1862 /deploy/compass_conf/templates
parent68a15541846c851b3309c014b0e28fa8502908c4 (diff)
enable http_proxy in kargo
Change-Id: Id49015d716f1b53806a42039a2c197e1c4ccbd69 Signed-off-by: Forrest Zhu <zhichao.zhu8@gmail.com>
Diffstat (limited to 'deploy/compass_conf/templates')
-rw-r--r--deploy/compass_conf/templates/ansible_installer/kubernetes/vars/ansible-kubernetes.tmpl4
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"]