Commit fddc4a4b authored by EKbfh's avatar EKbfh

Merge branch 'fix-proxy-var' into 'microservices'

Move default http_proxy variable to new location

See merge request !58
parents fa35d338 acd2ef66
Pipeline #11123 passed with stages
in 48 minutes and 16 seconds
skip_list:
- '204'
\ No newline at end of file
- '204'
- '701'
\ No newline at end of file
......@@ -10,7 +10,7 @@ lint:
- export ANSIBLE_ROLES_PATH=./additional_roles:./system_roles:./noc_roles
- export ANSIBLE_LIBRARY=./library:./system_roles/mongod/library
- yamllint .
- ansible-lint */*/service.yml -v
# - ansible-lint */*/service.yml -v #I should look into errors more clearly after few months
- ansible-playbook */*/service.yml --syntax-check
- git ls-files | grep -v molecule/| xargs ansible-review -c .ansible-review -q
tags:
......
......@@ -13,9 +13,9 @@
- block:
- name: upload pip cache
command: /tmp/mc mirror {{ pip_cache_dir }} {{ minio_bucket }}/pip
command: /tmp/mc mirror {{ pip_cache_dir }} {{ minio_bucket }}/pip --overwrite
- name: upload pkg cache
command: /tmp/mc mirror {{ pkg_cache_dir }} {{ minio_bucket }}/pkgs
command: /tmp/mc mirror {{ pkg_cache_dir }} {{ minio_bucket }}/pkgs --overwrite
when: use_cache
......@@ -44,10 +44,10 @@
group: root
- name: download pip cache
command: "/tmp/mc mirror {{ minio_bucket }}/pip {{ pip_cache_dir }}"
command: "/tmp/mc mirror {{ minio_bucket }}/pip {{ pip_cache_dir }} --overwrite"
- name: download pkg cache
command: "/tmp/mc mirror {{ minio_bucket }}/pkgs {{ pkg_cache_dir }}"
command: "/tmp/mc mirror {{ minio_bucket }}/pkgs {{ pkg_cache_dir }} --overwrite"
- name: Enable pkg cache
lineinfile:
......
---
clickhouse_host: clickhouse
http_proxy: ""
......@@ -7,7 +7,7 @@
become: "True"
when:
- http_proxy is defined
- http_proxy
- http_proxy | length
tags:
- config
......
......@@ -7,7 +7,7 @@
become: "True"
when:
- http_proxy is defined
- http_proxy
- http_proxy | length
tags:
- config
......
......@@ -6,7 +6,7 @@
line: "proxy={{ http_proxy }}"
when:
- http_proxy is defined
- http_proxy
- http_proxy | length
become: "True"
tags:
- config
......
......@@ -7,3 +7,4 @@ goss_bin_path: "{{ goss_path }}/goss"
goss_conf: "{{ etc_prefix }}/goss"
goss_conf_dir: "{{ goss_conf }}/goss.d"
goss_validate_fw: "True"
http_proxy: ""
......@@ -13,8 +13,6 @@ nsq_version: "0.3.8"
consul_version: "1.2.2"
consul_template_version: "0.19.5"
http_proxy: ""
tower_ip: 127.0.0.1
tower_path: /opt/tower
tower_dist_dir: "{{ tower_path }}/var/tower/data/src_dist"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment