aboutsummaryrefslogtreecommitdiffstats
path: root/docker/ansible/roles/run_collectd
diff options
context:
space:
mode:
Diffstat (limited to 'docker/ansible/roles/run_collectd')
-rw-r--r--docker/ansible/roles/run_collectd/tasks/main.yml6
-rw-r--r--docker/ansible/roles/run_collectd/vars/main.yml21
2 files changed, 24 insertions, 3 deletions
diff --git a/docker/ansible/roles/run_collectd/tasks/main.yml b/docker/ansible/roles/run_collectd/tasks/main.yml
index c77aad58..744c7a77 100644
--- a/docker/ansible/roles/run_collectd/tasks/main.yml
+++ b/docker/ansible/roles/run_collectd/tasks/main.yml
@@ -1,4 +1,4 @@
-#Copyright 2018 OPNFV and Intel Corporation
+#Copyright 2018-2019 OPNFV and Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
- name: Remove bar-collectd image
docker_image:
- name: opnfv/barometer-collectd
+ name: "{{ collectd_image_name }}"
state: absent
tags:
- rm_images
@@ -34,7 +34,7 @@
- name: launch collectd container
docker_container:
name: bar-collectd
- image: opnfv/barometer-collectd
+ image: "{{ collectd_image_name }}"
volumes:
- /opt/collectd/etc/collectd.conf.d/:/opt/collectd/etc/collectd.conf.d
- /var/run:/var/run
diff --git a/docker/ansible/roles/run_collectd/vars/main.yml b/docker/ansible/roles/run_collectd/vars/main.yml
new file mode 100644
index 00000000..cebd0f47
--- /dev/null
+++ b/docker/ansible/roles/run_collectd/vars/main.yml
@@ -0,0 +1,21 @@
+#Copyright 2019 OPNFV and Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+
+default_flavor: "{{ flavor|default('stable')|string }}"
+flavor_image_name: "{{
+ 'barometer-collectd-master' if (default_flavor == 'master') else
+ 'barometer-collectd-experimental' if (default_flavor == 'experimental')
+ else 'barometer-collectd' }}"
+collectd_image_name: "{{ 'opnfv/' + flavor_image_name }}"