fix redundancies in sensu_rabbitmq_sensu

defaults/main.yml

@@ -38,9 +38,9 @@ sensu_rabbitmq_port: 5671
 sensu_rabbitmq_pkg_state: present
 sensu_rabbitmq_server: false
 sensu_rabbitmq_service_name: rabbitmq-server
-sensu_rabbitmq_sensu_user_name: sensu
-sensu_rabbitmq_sensu_password: sensu
-sensu_rabbitmq_sensu_vhost: /sensu
+sensu_rabbitmq_user_name: sensu
+sensu_rabbitmq_password: sensu
+sensu_rabbitmq_vhost: /sensu
 
 # redis server properties
 sensu_redis_host: "{{ groups['sensu_redis_servers'][0] }}"

docs/integration.md

@@ -9,9 +9,9 @@ If you'd like to use a different role/management method for RabbitMQ, the follow
 sensu_deploy_rabbitmq_server: false
 sensu_rabbitmq_host: < IP/DNS record of your RabbitMQ server >
 sensu_rabbitmq_port: < optionally set a differing port, defaults to 5671 >
-sensu_rabbitmq_sensu_user_name: < the username for interacting with RabbitMQ >
-sensu_rabbitmq_sensu_password: < the password for interacting with RabbitMQ >
-sensu_rabbitmq_sensu_vhost: < the RabbitMQ vhost to use, defaults to '/sensu' >
+sensu_rabbitmq_user_name: < the username for interacting with RabbitMQ >
+sensu_rabbitmq_password: < the password for interacting with RabbitMQ >
+sensu_rabbitmq_vhost: < the RabbitMQ vhost to use, defaults to '/sensu' >
 sensu_rabbitmq_config_path: < the path to the RabbitMQ configuration >
 
 ```

docs/role_variables.md

@@ -19,9 +19,9 @@ _Note: The above options are intended to provide users with flexibility. This al
 | `sensu_rabbitmq_pkg_state` | present | The state of the RabbitMQ package (should be set to `present` or `latest`) |
 | `sensu_rabbitmq_server` | `false` | Determines whether to include the deployment of RabbitMQ |
 | `sensu_rabbitmq_service_name` | rabbitmq-server | The name of the RabbitMQ service |
-| `sensu_rabbitmq_sensu_user_name` | sensu | Username for authentication with the RabbitMQ vhost |
-| `sensu_rabbitmq_sensu_password` | sensu | Password for authentication with the RabbitMQ vhost |
-| `sensu_rabbitmq_sensu_vhost` | `/sensu` | Name of the RabbitMQ Sensu vhost |
+| `sensu_rabbitmq_user_name` | sensu | Username for authentication with the RabbitMQ vhost |
+| `sensu_rabbitmq_password` | sensu | Password for authentication with the RabbitMQ vhost |
+| `sensu_rabbitmq_vhost` | `/sensu` | Name of the RabbitMQ Sensu vhost |
 | `sensu_rabbitmq_enable_ssl` | `true` | Determines whether or not to use `ssl_listener` for RabbitMQ |
 
 ### [redis Server Properties](https://docs.sensu.io/sensu-core/latest/reference/redis/)

tasks/rabbit.yml

@@ -58,15 +58,15 @@
 
 - block:
     - name: Ensure Sensu RabbitMQ vhost exists
-      sensu_rabbitmq_vhost:
-        name: "{{ sensu_rabbitmq_sensu_vhost }}"
+      rabbitmq_vhost:
+        name: "{{ sensu_rabbitmq_vhost }}"
         state: present
 
     - name: Ensure Sensu RabbitMQ user has access to the Sensu vhost
-      sensu_rabbitmq_user:
-        user: "{{ sensu_rabbitmq_sensu_user_name }}"
-        password: "{{ sensu_rabbitmq_sensu_password }}"
-        vhost: "{{ sensu_rabbitmq_sensu_vhost }}"
+      rabbitmq_user:
+        user: "{{ sensu_rabbitmq_user_name }}"
+        password: "{{ sensu_rabbitmq_password }}"
+        vhost: "{{ sensu_rabbitmq_vhost }}"
         configure_priv: .*
         read_priv: .*
         write_priv: .*

templates/sensu-rabbitmq.json.j2

@@ -8,8 +8,8 @@
     {% endif %}
     "host": "{{ sensu_rabbitmq_host }}",
     "port": {{ sensu_rabbitmq_port }},
-    "vhost": "{{ sensu_rabbitmq_sensu_vhost }}",
-    "user": "{{ sensu_rabbitmq_sensu_user_name }}",
-    "password": "{{ sensu_rabbitmq_sensu_password }}"
+    "vhost": "{{ sensu_rabbitmq_vhost }}",
+    "user": "{{ sensu_rabbitmq_user_name }}",
+    "password": "{{ sensu_rabbitmq_password }}"
   }
 }