diff options
author | zhichaozhu <zhichao.zhu8@gmail.com> | 2018-04-25 12:37:45 +0800 |
---|---|---|
committer | wutianwei <wutianwei1@huawei.com> | 2018-05-08 12:40:56 +0000 |
commit | 7f0439ac27821dbaacda757bde56b3e53f27785c (patch) | |
tree | 867c5340ee827831e06e5994d0d046c3628e1862 /deploy/adapters/ansible/kubernetes/roles/kargo | |
parent | 68a15541846c851b3309c014b0e28fa8502908c4 (diff) |
enable http_proxy in kargo
Change-Id: Id49015d716f1b53806a42039a2c197e1c4ccbd69
Signed-off-by: Forrest Zhu <zhichao.zhu8@gmail.com>
Diffstat (limited to 'deploy/adapters/ansible/kubernetes/roles/kargo')
-rw-r--r-- | deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml | 15 | ||||
-rw-r--r-- | deploy/adapters/ansible/kubernetes/roles/kargo/vars/main.yml | 3 |
2 files changed, 17 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml b/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml index b9d9c234..0e253129 100644 --- a/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml +++ b/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml @@ -125,13 +125,26 @@ regexp: '^#loadbalancer_apiserver_localhost: true' line: 'loadbalancer_apiserver_localhost: true' +- name: enable http proxy + lineinfile: + dest: /opt/kargo_k8s/inventory/group_vars/all.yml + regexp: '^#http_proxy:' + line: 'http_proxy: {{ http_proxy }}' + when: http_proxy != '' + +- name: enable https proxy + lineinfile: + dest: /opt/kargo_k8s/inventory/group_vars/all.yml + regexp: '^#https_proxy:' + line: 'https_proxy: {{ https_proxy }}' + when: https_proxy !='' + - name: use the user name and password login the dashboard lineinfile: dest: /opt/kargo_k8s/inventory/group_vars/k8s-cluster.yml regexp: '^#kube_basic_auth: false' line: 'kube_basic_auth: true' - - name: add vip to ssl keys lineinfile: dest: /opt/kargo_k8s/inventory/group_vars/k8s-cluster.yml diff --git a/deploy/adapters/ansible/kubernetes/roles/kargo/vars/main.yml b/deploy/adapters/ansible/kubernetes/roles/kargo/vars/main.yml index 21287b02..80490955 100644 --- a/deploy/adapters/ansible/kubernetes/roles/kargo/vars/main.yml +++ b/deploy/adapters/ansible/kubernetes/roles/kargo/vars/main.yml @@ -4,3 +4,6 @@ apiserver_loadbalancer_domain_name: "{{ public_vip.ip }}" vipaddress: "{{ public_vip.ip }}" exlb_port: 8383 kubelet_fail_swap_on: false + +http_proxy: "{{ proxy }}" +https_proxy: "{{ proxy }}" |