summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/ansible/roles/run_grafana/tasks/main.yml13
-rw-r--r--requirements.txt6
2 files changed, 14 insertions, 5 deletions
diff --git a/docker/ansible/roles/run_grafana/tasks/main.yml b/docker/ansible/roles/run_grafana/tasks/main.yml
index 97012495..ea4ca8b9 100644
--- a/docker/ansible/roles/run_grafana/tasks/main.yml
+++ b/docker/ansible/roles/run_grafana/tasks/main.yml
@@ -31,6 +31,15 @@
- rm_grafana_image
when: rm_images|default(false)|bool == true
+- set_fact:
+ influxdb_host_ip_mapping: "{ '{{ influxdb_hostname }}': '{{ influxdb_host_ip }}' }"
+
+- name: Cleanup barometer-grafana cache directory under host
+ file:
+ path: /var/lib/grafana
+ state: absent
+ when: clean_grafana_cache|default(true)|bool == true
+
- name: launch barometer-grafana container
docker_container:
name: bar-grafana
@@ -40,9 +49,9 @@
ports:
- 3000:3000
env:
- "{{ influxdb_host }}": "{{ influxdb_hostname }}"
+ influxdb_host: "{{ influxdb_hostname }}"
etc_hosts:
- "{{ influxdb_hostname }}": "{{ influxdb_host_ip }}"
+ "{{ influxdb_host_ip_mapping }}"
detach: yes
restart: yes
network_mode: host
diff --git a/requirements.txt b/requirements.txt
index 55e2f3c7..57a2f51e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-paramiko>=2.0.0 # LGPLv2.1+
-requests>=2.14.2 # Apache-2.0
-python-keystoneclient>=3.8.0 # Apache-2.0
+paramiko # LGPLv2.1+
+requests # Apache-2.0
+python-keystoneclient!=2.1.0 # Apache-2.0
toml # MIT
opnfv # Apache-2.0
functest # Apache-2.0