From: Zack Cerza <zack@redhat.com>
Date: Tue, 20 Jun 2017 22:09:04 +0000 (-0600)
Subject: Compatibility for ansible < 2.3
X-Git-Tag: v1.0~67^2~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=616c8f32e7c00b64bc7d0c55d643050bf5ee4829;p=cephmetrics.git

Compatibility for ansible < 2.3

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml b/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml
index a9679e9..6b29498 100644
--- a/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml
+++ b/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml
@@ -33,14 +33,14 @@
 
 - name: Set hostname in write_graphite.conf
   replace:
-    path: "/etc/collectd.d/write_graphite.conf"
+    dest: "/etc/collectd.d/write_graphite.conf"
     regexp: 'Host ".*"'
     replace: "Host \"{{ groups['ceph-grafana'][0] }}\""
   notify: Restart collectd
 
 - name: Set cluster name in cephmetrics.conf
   replace:
-    path: /etc/collectd.d/cephmetrics.conf
+    dest: /etc/collectd.d/cephmetrics.conf
     regexp: 'ClusterName ".*"'
     replace: 'ClusterName "{{ cluster }}"'
   notify: Restart collectd
diff --git a/ansible/roles/ceph-grafana/tasks/configure_carbon.yml b/ansible/roles/ceph-grafana/tasks/configure_carbon.yml
index 0a52ac7..8b84c06 100644
--- a/ansible/roles/ceph-grafana/tasks/configure_carbon.yml
+++ b/ansible/roles/ceph-grafana/tasks/configure_carbon.yml
@@ -1,7 +1,7 @@
 ---
 - name: Configure retention for collectd stats
   blockinfile:
-    path: /etc/carbon/storage-schemas.conf
+    dest: /etc/carbon/storage-schemas.conf
     # NOTE: Retention settings are applied to metrics as they are *created*. If
     # these settings are changed after-the-fact, it's necessary to either
     # delete the whisper files (!) or run whisper-resize on them all.
diff --git a/ansible/roles/ceph-grafana/tasks/configure_grafana.yml b/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
index 9085cfd..ca516fd 100644
--- a/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
+++ b/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
@@ -54,7 +54,7 @@
 
 - name: Set domain in grafana.ini
   lineinfile:
-    path: /etc/grafana/grafana.ini
+    dest: /etc/grafana/grafana.ini
     regexp: "^domain = .*"
     insertafter: "^;domain = .*"
     line: "domain = {{ ansible_fqdn }}"
@@ -63,7 +63,7 @@
 
 - name: Set root_url in grafana.ini
   lineinfile:
-    path: /etc/grafana/grafana.ini
+    dest: /etc/grafana/grafana.ini
     regexp: "^root_url = .*"
     insertafter: "^;root_url = .*"
     line: "root_url = %(protocol)s://%(domain)s:3000"
diff --git a/ansible/roles/ceph-grafana/tasks/configure_graphite.yml b/ansible/roles/ceph-grafana/tasks/configure_graphite.yml
index 8627b5c..30ae6d6 100644
--- a/ansible/roles/ceph-grafana/tasks/configure_graphite.yml
+++ b/ansible/roles/ceph-grafana/tasks/configure_graphite.yml
@@ -28,7 +28,7 @@
 
 - name: Set VirtualHost port in graphite httpd config
   replace:
-    path: /etc/httpd/conf.d/graphite-web.conf
+    dest: /etc/httpd/conf.d/graphite-web.conf
     regexp: "^<VirtualHost \\*:.+>$"
     replace: "<VirtualHost *:{{ graphite.port }}>"
   notify: Restart graphite-web