Browse Source

Control sensu version (#47)

* ability to control sensu version

* Ensure Sensu SSL directory exists even if ssl_generate is not used
rginev 9 years ago
parent
commit
39c4a1ee1d
6 changed files with 13 additions and 10 deletions
  1. 3 0
      defaults/main.yml
  2. 1 1
      tasks/CentOS/main.yml
  3. 1 1
      tasks/Debian/main.yml
  4. 1 1
      tasks/Ubuntu/main.yml
  5. 7 0
      tasks/ssl.yml
  6. 0 7
      tasks/ssl_generate.yml

+ 3 - 0
defaults/main.yml

@@ -1,4 +1,7 @@
 ---
+# Sensu version
+sensu_package: sensu
+
 # Service deployment options
 sensu_deploy_rabbitmq: true
 sensu_deploy_redis: true

+ 1 - 1
tasks/CentOS/main.yml

@@ -18,4 +18,4 @@
       mode: 0644
 
   - name: Ensure Sensu is installed
-    yum: name=sensu state={{ sensu_pkg_state }}
+    yum: name={{ sensu_package }} state={{ sensu_pkg_state }}

+ 1 - 1
tasks/Debian/main.yml

@@ -16,4 +16,4 @@
       update_cache: true
 
   - name: Ensure Sensu is installed
-    apt: name=sensu state={{ sensu_pkg_state }}
+    apt: name={{ sensu_package }} state={{ sensu_pkg_state }}

+ 1 - 1
tasks/Ubuntu/main.yml

@@ -16,4 +16,4 @@
       update_cache: true
 
   - name: Ensure Sensu is installed
-    apt: name=sensu state={{ sensu_pkg_state }}
+    apt: name={{ sensu_package }} state={{ sensu_pkg_state }}

+ 7 - 0
tasks/ssl.yml

@@ -3,6 +3,13 @@
 
   - include_vars: "{{ ansible_distribution }}.yml"
 
+  - name: Ensure Sensu SSL directory exists
+    file:
+      dest: "{{ sensu_config_path }}/ssl"
+      state: directory
+      owner: "{{ sensu_user_name }}"
+      group: "{{ sensu_group_name }}"
+
   - include: ssl_generate.yml
     when: sensu_ssl_gen_certs
 

+ 0 - 7
tasks/ssl_generate.yml

@@ -4,13 +4,6 @@
 
   - include_vars: "{{ ansible_distribution }}.yml"
 
-  - name: Ensure Sensu SSL directory exists
-    file:
-      dest: "{{ sensu_config_path }}/ssl"
-      state: directory
-      owner: "{{ sensu_user_name }}"
-      group: "{{ sensu_group_name }}"
-
   - name: Ensure SSL generation directory exists
     file:
       dest: "{{ sensu_config_path }}/ssl_generation"