mirror of https://github.com/ceph/ceph-ansible.git
ceph-grafana: Add proxy env vars to grafana service template
When installing grafana plugins, the container will make http requests.
This requires http proxy otherwise installation cannot be performed. Passed
the proxy vars from all.yml as env args.
Fixes: ceph#6484, ceph#6481
Signed-off-by: John Karasev <john.karasev@intel.com>
(cherry picked from commit 79ca442d53
)
pull/7047/head
parent
3c38b1e410
commit
9d7e3bf2bb
|
@ -32,6 +32,15 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm --name=grafana-server \
|
|||
--memory={{ grafana_container_memory }}GB \
|
||||
--memory-swap={{ grafana_container_memory * 2 }}GB \
|
||||
-e GF_INSTALL_PLUGINS={{ grafana_plugins|join(',') }} \
|
||||
{% if ceph_docker_http_proxy is defined %}
|
||||
-e http_proxy={{ ceph_docker_http_proxy }} \
|
||||
{% endif %}
|
||||
{% if ceph_docker_https_proxy is defined %}
|
||||
-e https_proxy={{ ceph_docker_https_proxy }} \
|
||||
{% endif %}
|
||||
{% if ceph_docker_no_proxy is defined %}
|
||||
-e no_proxy={{ ceph_docker_no_proxy }} \
|
||||
{% endif %}
|
||||
{{ grafana_container_image }}
|
||||
{% if container_binary == 'podman' %}
|
||||
ExecStop=-/usr/bin/sh -c "/usr/bin/{{ container_binary }} rm -f `cat /%t/%n-cid`"
|
||||
|
|
Loading…
Reference in New Issue