From: Zack Cerza Date: Tue, 4 Jun 2019 22:58:49 +0000 (-0600) Subject: Replace improperly copied file w/ symlink X-Git-Tag: v2.0.3~3^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1d1173779a8acb8ee553828388b577181f49e818;p=cephmetrics.git Replace improperly copied file w/ symlink The rest of the roles symlink this file; this was a simple oversight. Signed-off-by: Zack Cerza --- diff --git a/ansible/roles/ceph-node-exporter/tasks/merge_vars.yml b/ansible/roles/ceph-node-exporter/tasks/merge_vars.yml deleted file mode 100644 index f8dbcd0..0000000 --- a/ansible/roles/ceph-node-exporter/tasks/merge_vars.yml +++ /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 diff --git a/ansible/roles/ceph-node-exporter/tasks/merge_vars.yml b/ansible/roles/ceph-node-exporter/tasks/merge_vars.yml new file mode 120000 index 0000000..5057c16 --- /dev/null +++ b/ansible/roles/ceph-node-exporter/tasks/merge_vars.yml @@ -0,0 +1 @@ +../../cephmetrics-common/tasks/merge_vars.yml \ No newline at end of file