Quellcode durchsuchen

feat(vars) All tasks must be named error

Michael Porter vor 6 Jahren
Ursprung
Commit
2cd62ff46c

+ 2 - 1
tasks/Amazon/dashboard.yml

@@ -2,7 +2,8 @@
 # tasks/Amazon/dashboard.yml: Deployment of the Uchiwa dashboard
 # Specific to CentOS
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: dashboard
 
 - name: Ensure Uchiwa is installed

+ 2 - 1
tasks/Amazon/main.yml

@@ -2,7 +2,8 @@
 # tasks/Amazon/main.yml: CentOS specific set-up
 # This takes care of base prerequisites for Amazon Linux AMI
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: setup
 
 - name: Set epel_version override when AmazonLinux AMIv2

+ 2 - 1
tasks/Amazon/rabbit.yml

@@ -2,7 +2,8 @@
 # tasks/Amazon/rabbit.yml: Deploy RabbitMQ
 # Specific to Amazon Linux
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: rabbitmq
 
 - name: Configure RabbitMQ/RabbitMQ-erlang GPG keys in the RPM keyring

+ 2 - 1
tasks/Amazon/redis.yml

@@ -2,7 +2,8 @@
 # tasks/Amazon/redis.yml: Deploy redis
 # Specific to Amazon Linux AMI
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: redis
 
 - name: Install EPEL repo

+ 4 - 1
tasks/CentOS/dashboard.yml

@@ -2,7 +2,10 @@
 # tasks/CentOS/dashboard.yml: Deployment of the Uchiwa dashboard
 # Specific to CentOS
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_varse ansible_distribution vars
+  include_varse ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: dashboard
 
 - name: Ensure Uchiwa is installed

+ 3 - 1
tasks/CentOS/main.yml

@@ -2,7 +2,9 @@
 # tasks/CentOS/main.yml: CentOS specific set-up
 # This takes care of base prerequisites for CentOS
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_varse ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: setup
 
 - name: Ensure the Sensu Core Yum repo is present

+ 3 - 1
tasks/CentOS/rabbit.yml

@@ -2,7 +2,9 @@
 # tasks/CentOS/rabbit.yml: Deploy RabbitMQ
 # Specific to CentOS
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_varse ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: rabbitmq
 
 - name: Configure RabbitMQ GPG keys in the RPM keyring

+ 3 - 1
tasks/CentOS/redis.yml

@@ -2,7 +2,9 @@
 # tasks/CentOS/redis.yml: Deploy redis
 # Specific to CentOS
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_varse ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: redis
 
 - name: Install EPEL repo

+ 2 - 1
tasks/Debian/dashboard.yml

@@ -2,7 +2,8 @@
 # tasks/Debian/dashboard.yml: Deployment of the Uchiwa dashboard
 # Specific to Debian
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: dashboard
 
 - name: Install uchiwa

+ 2 - 1
tasks/Debian/main.yml

@@ -2,7 +2,8 @@
 # tasks/Debian/main.yml: Debian specific set-up
 # This takes care of base prerequisites for Debian
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: setup
 
 - name: Ensure apt-transport-https is installed

+ 2 - 1
tasks/Debian/rabbit.yml

@@ -2,7 +2,8 @@
 # tasks/Debian/rabbit.yml: Deploy RabbitMQ
 # Specific to Debian
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: rabbitmq
 
 - name: Ensure the RabbitMQ APT repo GPG key is present

+ 2 - 1
tasks/Debian/redis.yml

@@ -2,7 +2,8 @@
 # tasks/Debian/redis.yml: Deploy redis
 # Specific to Debian
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: redis
 
 - name: Ensure redis is installed

+ 2 - 1
tasks/Fedora/rabbit.yml

@@ -2,7 +2,8 @@
 # tasks/Fedora/rabbit.yml: Deploy RabbitMQ
 # Specific to Fedora
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: rabbitmq
 
 - name: Configure RabbitMQ GPG keys in the RPM keyring

+ 2 - 1
tasks/Fedora/redis.yml

@@ -2,7 +2,8 @@
 # tasks/Fedora/redis.yml: Deploy redis
 # Specific to Fedora
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: redis
 
 - name: Ensure jemalloc is installed as a dependency of Redis

+ 2 - 1
tasks/FreeBSD/dashboard.yml

@@ -2,7 +2,8 @@
 # tasks/FreeBSD/dashboard.yml: Deployment of the Uchiwa dashboard
 # Specific to FreeBSD
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: dashboard
 
 - name: Ensure Uchiwa (dashboard) dependencies are installed

+ 2 - 1
tasks/FreeBSD/main.yml

@@ -2,7 +2,8 @@
 # tasks/FreeBSD/main.yml: FreeBSD specific set-up
 # This takes care of base prerequisites for FreeBSD
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: setup
 
 - name: Ensure the Sensu group is present

+ 2 - 1
tasks/FreeBSD/rabbit.yml

@@ -2,7 +2,8 @@
 # tasks/FreeBSD/rabbit.yml: Deploy RabbitMQ
 # Specific to FreeBSD
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: rabbitmq
 
 - name: Ensure RabbitMQ is installed

+ 2 - 1
tasks/FreeBSD/redis.yml

@@ -2,7 +2,8 @@
 # tasks/FreeBSD/redis.yml: Deploy redis
 # Specific to FreeBSD
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: redis
 
 - name: Ensure redis is installed

+ 2 - 1
tasks/OpenBSD/dashboard.yml

@@ -2,7 +2,8 @@
 # tasks/OpenBSD/dashboard.yml: Deployment of the Uchiwa dashboard
 # Specific to OpenBSD
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: dashboard
 
 - name: Ensure Uchiwa (dashboard) dependencies are installed

+ 2 - 1
tasks/OpenBSD/main.yml

@@ -2,7 +2,8 @@
 # tasks/OpenBSD/main.yml: OpenBSD specific set-up
 # This takes care of base prerequisites for OpenBSD
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: setup
 
 - name: Ensure the Sensu group is present

+ 2 - 1
tasks/OpenBSD/rabbit.yml

@@ -2,7 +2,8 @@
 # tasks/OpenBSD/rabbit.yml: Deploy RabbitMQ
 # Specific to OpenBSD
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: rabbitmq
 
 - name: Ensure RabbitMQ is installed

+ 2 - 1
tasks/OpenBSD/redis.yml

@@ -2,7 +2,8 @@
 # tasks/OpenBSD/redis.yml: Deploy redis
 # Specific to OpenBSD
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: redis
 
 - name: Ensure redis is installed

+ 2 - 1
tasks/SmartOS/client.yml

@@ -2,7 +2,8 @@
 # tasks/SmartOS/client.yml: Deploy various client-side configurations for Sensu
 # Specific to Joyent SmartOS
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: client
 
 - name: Deploy Sensu client service manifest

+ 2 - 1
tasks/SmartOS/dashboard.yml

@@ -2,7 +2,8 @@
 # tasks/SmartOS/dashboard.yml: Deployment of the Uchiwa dashboard
 # Specific to Joyent SmartOS
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: dashboard
 
 - name: Ensure Uchiwa (dashboard) dependencies are installed

+ 2 - 1
tasks/SmartOS/main.yml

@@ -2,7 +2,8 @@
 # tasks/SmartOS/main.yml: "Set-up" playbook for sensu.sensu role
 # This takes care of base prerequisites for Joyent SmartOS
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: setup
 
 - name: Ensure the Sensu group is present

+ 2 - 1
tasks/SmartOS/redis.yml

@@ -2,7 +2,8 @@
 # tasks/SmartOS/redis.yml: Deploy redis
 # Specific to Ubuntu
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: redis
 
 - name: Ensure redis is installed

+ 2 - 1
tasks/SmartOS/server.yml

@@ -3,7 +3,8 @@
 # a Sensu 'master' node.
 # Specific to SmartOS
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: server
 
 - name: Deploy Sensu server service manifest

+ 2 - 1
tasks/Ubuntu/dashboard.yml

@@ -2,7 +2,8 @@
 # tasks/Ubuntu/dashboard.yml: Deployment of the Uchiwa dashboard
 # Specific to Ubuntu
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: dashboard
 
 - name: Install Uchiwa

+ 2 - 1
tasks/Ubuntu/main.yml

@@ -2,7 +2,8 @@
 # tasks/Ubuntu/main.yml: Ubuntu specific set-up
 # This takes care of base prerequisites for Ubuntu
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: setup
 
 - name: Ensure that https transport is ready

+ 2 - 1
tasks/Ubuntu/rabbit.yml

@@ -2,7 +2,8 @@
 # tasks/Ubuntu/rabbit.yml: Deploy RabbitMQ
 # Specific to Ubuntu
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: rabbitmq
 
 - name: Ensure the RabbitMQ APT repo GPG key is present

+ 2 - 1
tasks/Ubuntu/redis.yml

@@ -2,7 +2,8 @@
 # tasks/Ubuntu/redis.yml: Deploy redis
 # Specific to Ubuntu
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
 
 - name: Ensure redis is installed
   apt:

+ 2 - 1
tasks/client.yml

@@ -1,7 +1,8 @@
 ---
 # tasks/client.yml: Deploy various client-side configurations for Sensu
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: client
 
 - name: Deploy Sensu client service configuration

+ 2 - 1
tasks/common.yml

@@ -1,7 +1,8 @@
 ---
 # tasks/common.yml: Deploy configurations common to client and server for Sensu
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
 
 - name: Ensure the Sensu config directory is present
   file:

+ 2 - 1
tasks/dashboard.yml

@@ -1,6 +1,7 @@
 ---
 # tasks/dashboard.yml: Deployment of the Uchiwa dashboard
-- include_tasks: "{{ role_path }}/tasks/{{ ansible_distribution }}/dashboard.yml"
+- name: Include ansible_distribution vars
+  include_tasks: "{{ role_path }}/tasks/{{ ansible_distribution }}/dashboard.yml"
   tags: dashboard
 
 - name: Ensure Uchiwa/Sensu Enterprise Dashboard server service is running

+ 2 - 1
tasks/plugins.yml

@@ -1,7 +1,8 @@
 ---
 # tasks/plugins.yml: Deploy available checks/plugins/handlers/filters/mutators
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
 
 - name: Ensure Sensu plugin directory exists
   file:

+ 2 - 1
tasks/rabbit.yml

@@ -1,7 +1,8 @@
 ---
 # tasks/rabbit.yml: Deploy RabbitMQ and set-up vhost for Sensu messaging
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: rabbitmq
 
 - include_tasks: "{{ ansible_distribution }}/rabbit.yml"

+ 2 - 1
tasks/redis.yml

@@ -1,7 +1,8 @@
 ---
 # tasks/redis.yml: Deploy redis
 
-- include_tasks: "{{ role_path }}/tasks/{{ ansible_distribution }}/redis.yml"
+- name: Include ansible_distribution vars
+  include_tasks: "{{ role_path }}/tasks/{{ ansible_distribution }}/redis.yml"
   tags: redis
 
 - name: Ensure redis is running

+ 2 - 1
tasks/server.yml

@@ -1,7 +1,8 @@
 ---
 # tasks/server.yml: Deploy Sensu Server/API
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
   tags: server
 
 - name: Deploy Sensu server API configuration

+ 2 - 1
tasks/ssl.yml

@@ -1,7 +1,8 @@
 ---
 # tasks/ssl.yml: Deploy the client SSL cert/key to client systems
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
 
 - name: Ensure Sensu SSL directory exists
   file:

+ 2 - 1
tasks/ssl_generate.yml

@@ -2,7 +2,8 @@
 # tasks/ssl_generate.yml: Generate SSL data and stash to dynamic
 # data store for deployment to clients
 
-- include_vars: "{{ ansible_distribution }}.yml"
+- name: Include ansible_distribution vars
+  include_vars: "{{ ansible_distribution }}.yml"
 
 - name: Ensure OpenSSL is installed
   package: