From: Andrew Schoen <aschoen@redhat.com>
Date: Mon, 4 Jan 2016 21:45:23 +0000 (-0600)
Subject: move sensu-vars.yml into an ansible/vars folder
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F273%2Fhead;p=ceph-build.git

move sensu-vars.yml into an ansible/vars folder

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/ansible/sensu-vars.yml b/ansible/sensu-vars.yml
deleted file mode 100644
index aa28adc4..00000000
--- a/ansible/sensu-vars.yml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-# Set the rabbitmq address
-rabbitmq_conf_tcp_listeners_address: '0.0.0.0'
-
-sensu_server_rabbitmq_insecure: true
-
-# Sensu client variable
-
-sensu_checks:
-  cpu:
-    command: "check-cpu.rb"
-    interval: 10
-    subscribers:
-      - common
-  disk:
-    command: "check-disk-usage.rb -w 85 -c 95"
-    interval: 10
-    subscribers:
-      - common
-  load:
-    command: "check-load.rb"
-    interval: 10
-    subscribers:
-      - common
-  memory:
-    command: "check-memory.rb -w 85 -c 95"
-    interval: 10
-    subscribers:
-      - common
-  rabbitmq-alive:
-    command: "check-rabbitmq-amqp-alive.rb -u :::rabbitmq.user|guest::: -p :::rabbitmq.password|guest::: -v :::rabbitmq.vhost|%2F:::"
-    interval: 10
-    subscribers:
-      - rabbitmq
-
-sensu_ruby_gem_plugins:
-  - "sensu-plugins-load-checks"
-  - "sensu-plugins-memory-checks"
-  - "sensu-plugins-disk-checks"
-  - "sensu-plugins-cpu-checks"
-  - "sensu-plugins-rabbitmq"
-
-# Dummy sensu_handlers
-sensu_handlers:
-  test_handler:
-    type   : pipe
-    command: "echo"
diff --git a/ansible/sensu.yml b/ansible/sensu.yml
index f0b93325..8d13ff2d 100644
--- a/ansible/sensu.yml
+++ b/ansible/sensu.yml
@@ -6,7 +6,7 @@
 - hosts: sensu-server
   sudo: true
   vars_files:
-    - sensu-vars.yml
+    - vars/sensu-vars.yml
   roles:
     - role: Mayeu.RabbitMQ
       rabbitmq_vhost_definitions:
@@ -40,7 +40,7 @@
 - hosts: sensu-clients
   sudo: true
   vars_files:
-    - sensu-vars.yml
+    - vars/sensu-vars.yml
   roles:
     - role: Mayeu.sensu
       sensu_server_rabbitmq_hostname: "{{ rabbitmq_client_address|mandatory }}"
diff --git a/ansible/vars/sensu-vars.yml b/ansible/vars/sensu-vars.yml
new file mode 100644
index 00000000..aa28adc4
--- /dev/null
+++ b/ansible/vars/sensu-vars.yml
@@ -0,0 +1,47 @@
+---
+# Set the rabbitmq address
+rabbitmq_conf_tcp_listeners_address: '0.0.0.0'
+
+sensu_server_rabbitmq_insecure: true
+
+# Sensu client variable
+
+sensu_checks:
+  cpu:
+    command: "check-cpu.rb"
+    interval: 10
+    subscribers:
+      - common
+  disk:
+    command: "check-disk-usage.rb -w 85 -c 95"
+    interval: 10
+    subscribers:
+      - common
+  load:
+    command: "check-load.rb"
+    interval: 10
+    subscribers:
+      - common
+  memory:
+    command: "check-memory.rb -w 85 -c 95"
+    interval: 10
+    subscribers:
+      - common
+  rabbitmq-alive:
+    command: "check-rabbitmq-amqp-alive.rb -u :::rabbitmq.user|guest::: -p :::rabbitmq.password|guest::: -v :::rabbitmq.vhost|%2F:::"
+    interval: 10
+    subscribers:
+      - rabbitmq
+
+sensu_ruby_gem_plugins:
+  - "sensu-plugins-load-checks"
+  - "sensu-plugins-memory-checks"
+  - "sensu-plugins-disk-checks"
+  - "sensu-plugins-cpu-checks"
+  - "sensu-plugins-rabbitmq"
+
+# Dummy sensu_handlers
+sensu_handlers:
+  test_handler:
+    type   : pipe
+    command: "echo"