diff options
| -rw-r--r-- | .ansible-lint | 4 | ||||
| -rw-r--r-- | ansible/roles/ceilometer/tasks/config.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/cloudkitty/tasks/config.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/mariadb/tasks/backup.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/octavia-certificates/tasks/check_expiry.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/octavia-certificates/tasks/main.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/octavia/tasks/get_resources_info.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/octavia/tasks/hm-interface.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/octavia/tasks/prepare.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/service-rabbitmq/tasks/main.yml | 4 |
10 files changed, 12 insertions, 16 deletions
diff --git a/.ansible-lint b/.ansible-lint index a54386cc2..6122339fc 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -14,13 +14,9 @@ skip_list: - unnamed-task # disable experimental rules - experimental - # Package installs should not use latest - - package-latest # NOTE(frickler): Agreed at Zed PTG not to use FQCN for builtin actions for now, due to # conflicts with open patches and backports. - fqcn-builtins - # Allow Jinja templating inside task and play names - - name[template] # FQCNs again, now for module actions - fqcn[action] # TODO(frickler): Discuss these in detail, skipping for now to unblock things diff --git a/ansible/roles/ceilometer/tasks/config.yml b/ansible/roles/ceilometer/tasks/config.yml index 2ef8f7287..41c072525 100644 --- a/ansible/roles/ceilometer/tasks/config.yml +++ b/ansible/roles/ceilometer/tasks/config.yml @@ -54,7 +54,7 @@ - should_copy_custom_meter_definitions with_dict: "{{ ceilometer_services | select_services_enabled_and_mapped_to_host }}" -- name: Check if the folder ["{{ node_custom_config }}/ceilometer/{{ ceilometer_dynamic_pollsters_local_folder }}"] for dynamic pollsters definitions exist +- name: Check if the folder for dynamic pollsters definitions exist stat: path: "{{ node_custom_config }}/ceilometer/{{ ceilometer_dynamic_pollsters_local_folder }}" delegate_to: localhost diff --git a/ansible/roles/cloudkitty/tasks/config.yml b/ansible/roles/cloudkitty/tasks/config.yml index 89dcfeb03..806d7d93e 100644 --- a/ansible/roles/cloudkitty/tasks/config.yml +++ b/ansible/roles/cloudkitty/tasks/config.yml @@ -28,13 +28,13 @@ when: - cloudkitty_policy.results | length > 0 -- name: Check if custom {{ cloudkitty_custom_metrics_yaml_file }} exists +- name: Check if custom metrics file exists stat: path: "{{ node_custom_config }}/cloudkitty/{{ cloudkitty_custom_metrics_yaml_file }}" delegate_to: localhost register: cloudkitty_custom_metrics_file -- name: Copying {{ cloudkitty_custom_metrics_yaml_file }} if it exists +- name: Copying custom metrics file copy: src: "{{ node_custom_config }}/cloudkitty/{{ cloudkitty_custom_metrics_yaml_file }}" dest: "{{ node_config_directory }}/{{ item.key }}/{{ cloudkitty_custom_metrics_yaml_file }}" diff --git a/ansible/roles/mariadb/tasks/backup.yml b/ansible/roles/mariadb/tasks/backup.yml index c07d7ded6..55a7fcf51 100644 --- a/ansible/roles/mariadb/tasks/backup.yml +++ b/ansible/roles/mariadb/tasks/backup.yml @@ -9,7 +9,7 @@ check_mode: false register: container_facts -- name: Taking {{ mariadb_backup_type }} database backup via Mariabackup +- name: Taking database backup via Mariabackup - backup type {{ mariadb_backup_type }} vars: cmd: "{{ 'kolla_mariadb_backup.sh' if mariadb_backup_target == 'active' else 'kolla_mariadb_backup_replica.sh' }}" become: true diff --git a/ansible/roles/octavia-certificates/tasks/check_expiry.yml b/ansible/roles/octavia-certificates/tasks/check_expiry.yml index 0f2ee4041..41e31f20a 100644 --- a/ansible/roles/octavia-certificates/tasks/check_expiry.yml +++ b/ansible/roles/octavia-certificates/tasks/check_expiry.yml @@ -11,7 +11,7 @@ - "client_ca.cert.pem" - "client.cert-and-key.pem" -- name: Check whether certificates are valid within {{ octavia_certs_expiry_limit }} days +- name: Check whether certificates are valid within days limit - {{ octavia_certs_expiry_limit }} assert: that: - item.valid_at.point_1 diff --git a/ansible/roles/octavia-certificates/tasks/main.yml b/ansible/roles/octavia-certificates/tasks/main.yml index be0288787..b15a591f8 100644 --- a/ansible/roles/octavia-certificates/tasks/main.yml +++ b/ansible/roles/octavia-certificates/tasks/main.yml @@ -34,13 +34,13 @@ - import_tasks: client_cert.yml - - name: Ensure {{ node_custom_config }}/octavia directory exists + - name: Ensure octavia directory exists under {{ node_custom_config }} file: path: "{{ node_custom_config }}/octavia" state: "directory" mode: "0770" - - name: Copy the to-be-deployed keys and certs to {{ node_custom_config }}/octavia + - name: Copy the to-be-deployed keys and certs copy: src: "{{ octavia_certs_work_dir }}/{{ item.src }}" dest: "{{ node_custom_config }}/octavia/{{ item.dest }}" diff --git a/ansible/roles/octavia/tasks/get_resources_info.yml b/ansible/roles/octavia/tasks/get_resources_info.yml index 71576360c..5dfd86046 100644 --- a/ansible/roles/octavia/tasks/get_resources_info.yml +++ b/ansible/roles/octavia/tasks/get_resources_info.yml @@ -15,7 +15,7 @@ delegate_to: "{{ groups['octavia-api'][0] }}" register: flavor_results -- name: Get {{ octavia_service_auth_project }} project id +- name: Get project id for project {{ octavia_service_auth_project }} become: true kolla_toolbox: container_engine: "{{ kolla_container_engine }}" diff --git a/ansible/roles/octavia/tasks/hm-interface.yml b/ansible/roles/octavia/tasks/hm-interface.yml index a04c14358..498b6a124 100644 --- a/ansible/roles/octavia/tasks/hm-interface.yml +++ b/ansible/roles/octavia/tasks/hm-interface.yml @@ -86,7 +86,7 @@ enabled: true state: started -- name: Wait for interface {{ octavia_network_interface }} ip appear +- name: Wait for interface ip appear on {{ octavia_network_interface }} vars: port_ip: "{{ port_info.port.fixed_ips[0].ip_address }}" command: ip address show dev {{ octavia_network_interface }} diff --git a/ansible/roles/octavia/tasks/prepare.yml b/ansible/roles/octavia/tasks/prepare.yml index 817008e25..3e6ffa1a3 100644 --- a/ansible/roles/octavia/tasks/prepare.yml +++ b/ansible/roles/octavia/tasks/prepare.yml @@ -39,7 +39,7 @@ run_once: true delegate_to: "{{ groups['octavia-api'][0] }}" -- name: Get {{ octavia_service_auth_project }} project id +- name: Get project id for project {{ octavia_service_auth_project }} become: true kolla_toolbox: container_engine: "{{ kolla_container_engine }}" diff --git a/ansible/roles/service-rabbitmq/tasks/main.yml b/ansible/roles/service-rabbitmq/tasks/main.yml index 415d988ef..550bc679b 100644 --- a/ansible/roles/service-rabbitmq/tasks/main.yml +++ b/ansible/roles/service-rabbitmq/tasks/main.yml @@ -6,7 +6,7 @@ tags: - service-rabbitmq block: - - name: "{{ project_name }} | Ensure RabbitMQ vhosts exist" + - name: "Ensure RabbitMQ vhosts exist for {{ project_name }}" kolla_toolbox: container_engine: "{{ kolla_container_engine }}" module_name: rabbitmq_vhost @@ -19,7 +19,7 @@ retries: "{{ service_rabbitmq_retries }}" delay: "{{ service_rabbitmq_delay }}" - - name: "{{ project_name }} | Ensure RabbitMQ users exist" + - name: "Ensure RabbitMQ users exist for {{ project_name }}" kolla_toolbox: container_engine: "{{ kolla_container_engine }}" module_name: rabbitmq_user |