Ver código fonte

Drop sensu_pkg_version entirely

Jared Ledvina 7 anos atrás
pai
commit
eeea144e6b

+ 0 - 1
defaults/main.yml

@@ -7,7 +7,6 @@ se_pass: ''
 
 # Sensu package
 sensu_package: sensu
-sensu_pkg_version:  # This 'none' value allows the var to be overriden in /vars or in group/host_vars
 sensu_enterprise_package: sensu-enterprise
 sensu_enterprise_dashboard_package: sensu-enterprise-dashboard
 

+ 3 - 4
docs/role_variables.md

@@ -102,7 +102,7 @@ _Note: The above options are intended to provide users with flexibility. This al
 |--------------------|---------------|------------------------------|
 | `sensu_user_name`    | root        | The name of the Sensu service user |
 | `sensu_group_name`   | root        | The name of the Sensu service user's primary group |
-| `sensu_package`      | sensu       | The name of the Sensu package. Can optionally include a version (sensu=0.20.3-1) |
+| `sensu_package`      | sensu       | The name of the Sensu package. |
 
 ## Debian
 ### [redis Server Properties](https://sensuapp.org/docs/latest/reference/redis)
@@ -116,7 +116,7 @@ _Note: The above options are intended to provide users with flexibility. This al
 |--------------------|---------------|------------------------------|
 | `sensu_user_name`    | root        | The name of the Sensu service user |
 | `sensu_group_name`   | root        | The name of the Sensu service user's primary group |
-| `sensu_package`      | sensu       | The name of the Sensu package. Can optionally include a version (sensu=0.20.3-1) |
+| `sensu_package`      | sensu       | The name of the Sensu package. |
 
 ## CentOS
 ### [Sensu Properties](https://sensuapp.org/docs/latest/installation/overview)
@@ -146,8 +146,7 @@ _Note: The above options are intended to provide users with flexibility. This al
 | Name               | Default Value | Description                  |
 |--------------------|---------------|------------------------------|
 | `sensu_config_path` | `/usr/local/etc/sensu` | Path to the Sensu configuration directory |
-| `sensu_pkg_version` | `0.29.0_1` | Version of Sensu to download and install |
-| `sensu_pkg_download_url` | `https://sensu.global.ssl.fastly.net/freebsd/FreeBSD:{{ ansible_distribution_major_version }}:{{ ansible_architecture }}/sensu/sensu-{{ sensu_pkg_version }}.txz` | URL to download Sensu from |
+| `sensu_pkg_download_url` | `https://sensu.global.ssl.fastly.net/freebsd/FreeBSD:{{ ansible_distribution_major_version }}:{{ ansible_architecture }}/sensu/{{ sensu_package }}.txz` | URL to download Sensu from |
 | `sensu_pkg_download_path` | `/root/sensu_latest.txz` | Path to store package file to |
 
 ### [RabbitMQ Server Properties](https://sensuapp.org/docs/latest/reference/rabbitmq)

+ 1 - 6
tasks/CentOS/main.yml

@@ -4,11 +4,6 @@
 
   - include_vars: "{{ ansible_distribution }}.yml"
 
-  - name: Set sensu_pkg_version {{ ansible_distribution }} override
-    set_fact:
-      sensu_pkg_version: "{{ _sensu_pkg_version }}"
-    when: sensu_pkg_version is none
-
   - name: Ensure the Sensu Core Yum repo is present
     yum_repository:
       name: sensu
@@ -59,7 +54,7 @@
 
   - name: Ensure Sensu is installed
     package:
-      name: "{{sensu_package }}-{{sensu_pkg_version}}"
+      name: "{{sensu_package }}"
       state: "{{ sensu_pkg_state }}"
 
   - name: Ensure Sensu Enterprise is installed

+ 1 - 6
tasks/FreeBSD/main.yml

@@ -4,11 +4,6 @@
 
   - include_vars: "{{ ansible_distribution }}.yml"
 
-  - name: Set sensu_pkg_version {{ ansible_distribution }} override
-    set_fact:
-      sensu_pkg_version: "{{ _sensu_pkg_version }}"
-    when: sensu_pkg_version is none
-
   - name: Ensure the Sensu group is present
     group: name={{ sensu_group_name }} state=present
 
@@ -43,5 +38,5 @@
 
   - name: Install sensu
     pkgng:
-      name: "sensu{% if sensu_pkg_version %}-{{ sensu_pkg_version }}{% endif %}"
+      name: "{{ sensu_package }}"
       state: present

+ 0 - 3
vars/CentOS.yml

@@ -2,8 +2,5 @@
 # vars/CentOS.yml: Variables for CentOS
 # Defaults are defined in defaults/main.yml
 
-# Sensu/Uchiwa user/group/service properties
-_sensu_pkg_version: '0.29.0'
-
 #Set this to false to disable the EPEL repo installation
 enable_epel_repo: true

+ 0 - 3
vars/Fedora.yml

@@ -2,8 +2,5 @@
 # vars/Fedora.yml: Variables for Fedora
 # Defaults are defined in defaults/main.yml
 
-# Sensu/Uchiwa user/group/service properties
-_sensu_pkg_version: '1.2.1'
-
 #RH/Centos 7 version works for Fedora 25 as a client
 sensu_yum_repo_url: "https://sensu.global.ssl.fastly.net/yum/7/$basearch/"

+ 0 - 1
vars/FreeBSD.yml

@@ -4,7 +4,6 @@
 
 # Sensu config/package properties
 sensu_config_path: /usr/local/etc/sensu
-_sensu_pkg_version: ~
 
 # RabbitMQ options
 rabbitmq_config_path: /usr/local/etc/rabbitmq