]> git-server-git.apps.pok.os.sepia.ceph.com Git - cephmetrics.git/commitdiff
Replace improperly copied file w/ symlink
authorZack Cerza <zack@redhat.com>
Tue, 4 Jun 2019 22:58:49 +0000 (16:58 -0600)
committerZack Cerza <zack@redhat.com>
Tue, 4 Jun 2019 23:34:12 +0000 (17:34 -0600)
The rest of the roles symlink this file; this was a simple oversight.

Signed-off-by: Zack Cerza <zack@redhat.com>
ansible/roles/ceph-node-exporter/tasks/merge_vars.yml [changed from file to symlink]

deleted file mode 100644 (file)
index f8dbcd0abaaeafc8fbaa013cf76136fc430f566f..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- name: Combine default settings and user-defined variables
-  set_fact: {"{{ item }}": "{% if vars[item] is not defined %}{{ defaults[item] }}{% elif vars[item] is mapping %}{{ defaults[item]|combine(vars[item]|default({})) }}{% else %}{{ vars[item] }}{% endif %}"}
-  with_items: "{{ defaults.keys() }}"
-  no_log: true
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..5057c168a95105c16a7571ef39beff27bf4d3eda
--- /dev/null
@@ -0,0 +1 @@
+../../cephmetrics-common/tasks/merge_vars.yml
\ No newline at end of file