From a6cb008c546b539a21bc9f1544bca9720fda1e87 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 13 Jan 2020 10:37:35 +0000 Subject: [PATCH] Ansible lint: task names Change-Id: Iecbc2fe5fa3391dca5a3cc7e575314b95942114b Co-Authored-By: Marcin Juszkiewicz --- ansible/roles/ceph/tasks/bootstrap_osds.yml | 6 ++++-- ansible/roles/glance/tasks/rolling_upgrade.yml | 6 ++++-- ansible/roles/haproxy/tasks/precheck.yml | 3 ++- ansible/roles/horizon/tasks/config.yml | 3 ++- ansible/roles/mariadb/tasks/bootstrap_cluster.yml | 3 ++- ansible/roles/mariadb/tasks/recover_cluster.yml | 6 ++++-- ansible/roles/qdrouterd/tasks/precheck.yml | 4 +++- ansible/roles/rabbitmq/tasks/precheck.yml | 8 ++++++-- 8 files changed, 27 insertions(+), 12 deletions(-) diff --git a/ansible/roles/ceph/tasks/bootstrap_osds.yml b/ansible/roles/ceph/tasks/bootstrap_osds.yml index 44f10d852e..6559f61847 100644 --- a/ansible/roles/ceph/tasks/bootstrap_osds.yml +++ b/ansible/roles/ceph/tasks/bootstrap_osds.yml @@ -25,7 +25,8 @@ set_fact: osds_cache_bootstrap: "{{ (osd_cache_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).disks|from_json }}" -- pause: +- name: Prompting before wiping existing partitions + pause: prompt: | WARNING: It seems {{ item.device }} is marked to be wiped and partitioned for Ceph data and a co-located journal, but appears to contain other existing partitions (>1). @@ -86,7 +87,8 @@ - "kolla_logs:/var/log/kolla/" with_indexed_items: "{{ osds_bootstrap|default([]) }}" -- pause: +- name: Prompting before wiping existing partitions + pause: prompt: | WARNING: It seems {{ item.device }} is marked to be wiped and partitioned for Ceph data and a co-located journal, but appears to contain other existing partitions (>1). diff --git a/ansible/roles/glance/tasks/rolling_upgrade.yml b/ansible/roles/glance/tasks/rolling_upgrade.yml index d53134e701..de4ae4541a 100644 --- a/ansible/roles/glance/tasks/rolling_upgrade.yml +++ b/ansible/roles/glance/tasks/rolling_upgrade.yml @@ -1,5 +1,6 @@ --- -- set_fact: +- name: Start Glance upgrade + set_fact: glance_upgrading: True # Upgrade first node (NEW NODE in the Glance documentation) @@ -113,5 +114,6 @@ when: - not use_preconfigured_databases | bool -- set_fact: +- name: Finish Glance upgrade + set_fact: glance_upgrading: False diff --git a/ansible/roles/haproxy/tasks/precheck.yml b/ansible/roles/haproxy/tasks/precheck.yml index c62362adb7..74a692b13b 100644 --- a/ansible/roles/haproxy/tasks/precheck.yml +++ b/ansible/roles/haproxy/tasks/precheck.yml @@ -225,7 +225,8 @@ failed_when: false when: container_facts['haproxy'] is defined -- set_fact: +- name: Setting haproxy stat fact + set_fact: haproxy_stat: "{{ haproxy_stat_shell.stdout|default('') }}" - name: Checking free port for Aodh API HAProxy diff --git a/ansible/roles/horizon/tasks/config.yml b/ansible/roles/horizon/tasks/config.yml index 4030a8fb7d..888a3e8b2f 100644 --- a/ansible/roles/horizon/tasks/config.yml +++ b/ansible/roles/horizon/tasks/config.yml @@ -12,7 +12,8 @@ - item.value.enabled | bool with_dict: "{{ horizon_services }}" -- set_fact: +- name: Set empty custom policy + set_fact: custom_policy: [] - include_tasks: policy_item.yml diff --git a/ansible/roles/mariadb/tasks/bootstrap_cluster.yml b/ansible/roles/mariadb/tasks/bootstrap_cluster.yml index e843fcc0d8..e9efe4391d 100644 --- a/ansible/roles/mariadb/tasks/bootstrap_cluster.yml +++ b/ansible/roles/mariadb/tasks/bootstrap_cluster.yml @@ -22,5 +22,6 @@ notify: - Bootstrap MariaDB cluster -- set_fact: +- name: Store bootstrap host name into facts + set_fact: bootstrap_host: "{{ inventory_hostname }}" diff --git a/ansible/roles/mariadb/tasks/recover_cluster.yml b/ansible/roles/mariadb/tasks/recover_cluster.yml index 4c097d80f8..2ae6ca0d96 100644 --- a/ansible/roles/mariadb/tasks/recover_cluster.yml +++ b/ansible/roles/mariadb/tasks/recover_cluster.yml @@ -1,5 +1,6 @@ --- -- fail: +- name: Cheching for mariadb cluster + fail: msg: "MariaDB cluster was not found. Is your inventory correct?" when: not has_cluster | bool @@ -95,7 +96,8 @@ when: - mariadb_recover_inventory_name is not defined -- set_fact: +- name: Store bootstrap and master hostnames into facts + set_fact: bootstrap_host: "{{ mariadb_recover_inventory_name }}" master_host: "{{ mariadb_recover_inventory_name }}" changed_when: true diff --git a/ansible/roles/qdrouterd/tasks/precheck.yml b/ansible/roles/qdrouterd/tasks/precheck.yml index 0ba5b5f371..67b3a44435 100644 --- a/ansible/roles/qdrouterd/tasks/precheck.yml +++ b/ansible/roles/qdrouterd/tasks/precheck.yml @@ -25,7 +25,9 @@ register: qdrouterd_hostnames with_items: "{{ groups['qdrouterd'] }}" -- fail: msg="Hostname has to resolve to IP address of api_interface" +- name: Check if hostname resolves to IP address of api_interface + fail: + msg: "Hostname has to resolve to IP address of api_interface" with_items: "{{ qdrouterd_hostnames.results }}" when: - "item.stdout.find('api' | kolla_address(item['item'])) == -1" diff --git a/ansible/roles/rabbitmq/tasks/precheck.yml b/ansible/roles/rabbitmq/tasks/precheck.yml index 10559d2d5a..3f462c3608 100644 --- a/ansible/roles/rabbitmq/tasks/precheck.yml +++ b/ansible/roles/rabbitmq/tasks/precheck.yml @@ -59,7 +59,9 @@ register: rabbitmq_hostnames with_items: "{{ groups['rabbitmq'] }}" -- fail: msg="Hostname has to resolve to IP address of api_interface" +- name: Check if rabbit hostname resolves to IP address of api_interface + fail: + msg: "Hostname has to resolve to IP address of api_interface" with_items: "{{ rabbitmq_hostnames.results }}" when: - "item.stdout.find('api' | kolla_address(item['item'])) == -1" @@ -118,7 +120,9 @@ when: - enable_outward_rabbitmq | bool -- fail: msg="Hostname has to resolve to IP address of api_interface" +- name: Check if rabbit hostname resolves to IP address of api_interface + fail: + msg: "Hostname has to resolve to IP address of api_interface" with_items: "{{ outward_rabbitmq_hostnames.results }}" when: - enable_outward_rabbitmq | bool