Synchronise master with upstream

.ansible-lint

@@ -11,9 +11,6 @@ strict: false
 skip_list:
   # disable experimental rules
   - experimental
-  # 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
   # FQCNs again, now for module actions
   - fqcn[action]
   # Role names

ansible/gather-facts.yml

@@ -12,12 +12,12 @@
   gather_facts: false
   tasks:
     - name: Group hosts to determine when using --limit
-      group_by:
+      ansible.builtin.group_by:
         key: "all_using_limit_{{ (ansible_play_batch | length) != (groups['all'] | length) }}"
       changed_when: false
 
     - name: Gather facts
-      setup:
+      ansible.builtin.setup:
         filter: "{{ kolla_ansible_setup_filter }}"
         gather_subset: "{{ kolla_ansible_setup_gather_subset }}"
       when:
@@ -47,7 +47,7 @@
     delegate_hosts: "{{ kolla_ansible_delegate_facts_hosts[batch_index | int::batch_size | int] }}"
   tasks:
     - name: Gather facts
-      setup:
+      ansible.builtin.setup:
         filter: "{{ kolla_ansible_setup_filter }}"
         gather_subset: "{{ kolla_ansible_setup_gather_subset }}"
       delegate_facts: true

ansible/group_vars/all/grafana.yml

@@ -9,3 +9,5 @@ grafana_public_endpoint: "{{ grafana_external_fqdn | kolla_url(public_protocol,
 grafana_server_port: "3000"
 grafana_server_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else grafana_server_port }}"
 grafana_server_listen_port: "{{ grafana_server_port }}"
+
+grafana_ldap_enabled: false

ansible/mariadb.yml

@@ -13,7 +13,7 @@
     - mariadb
   tasks:
     - name: Apply mariadb role
-      import_role:
+      ansible.builtin.import_role:
         name: mariadb
 
 - name: Restart mariadb services
@@ -31,7 +31,7 @@
     - mariadb
   tasks:
     - name: Restart mariadb services
-      import_role:
+      ansible.builtin.import_role:
         name: mariadb
         tasks_from: restart_services.yml
 
@@ -50,7 +50,7 @@
     - mariadb
   tasks:
     - name: Start mariadb services
-      import_role:
+      ansible.builtin.import_role:
         name: mariadb
         tasks_from: restart_services.yml
 
@@ -67,7 +67,7 @@
     - mariadb
   tasks:
     - name: Restart bootstrap mariadb service
-      import_role:
+      ansible.builtin.import_role:
         name: mariadb
         tasks_from: restart_services.yml
 
@@ -84,13 +84,13 @@
     - mariadb
   tasks:
     - name: Include mariadb post-deploy.yml
-      include_role:
+      ansible.builtin.include_role:
         name: mariadb
         tasks_from: post-deploy.yml
       when: kolla_action in ['deploy', 'reconfigure', 'upgrade']
 
     - name: Include mariadb post-upgrade.yml
-      include_role:
+      ansible.builtin.include_role:
         name: mariadb
         tasks_from: post-upgrade.yml
       when: kolla_action == 'upgrade'

ansible/nova-libvirt-cleanup.yml

@@ -15,6 +15,6 @@
     - nova-libvirt-cleanup
   tasks:
     - name: Clean up nova libvirt container and configuration
-      import_role:
+      ansible.builtin.import_role:
         name: nova-cell
         tasks_from: libvirt-cleanup.yml

ansible/nova.yml

@@ -47,7 +47,7 @@
     # * Map cell0
     # * Cell0 DB schema migrations
     - name: Bootstrap deploy
-      include_role:
+      ansible.builtin.include_role:
         name: nova
         tasks_from: bootstrap
       when:
@@ -57,7 +57,7 @@
     # * API DB schema migrations
     # * Cell0 DB schema migrations
     - name: Bootstrap upgrade
-      include_role:
+      ansible.builtin.include_role:
         name: nova
         tasks_from: bootstrap_upgrade
       when:
@@ -83,7 +83,7 @@
     # * Cell DB schema migrations
     # * Create cell mappings
     - name: Bootstrap deploy
-      include_role:
+      ansible.builtin.include_role:
         name: nova-cell
         tasks_from: bootstrap
       when:
@@ -92,7 +92,7 @@
 
     # * Cell DB schema migrations
     - name: Bootstrap upgrade
-      include_role:
+      ansible.builtin.include_role:
         name: nova-cell
         tasks_from: bootstrap_upgrade
       when:
@@ -165,7 +165,7 @@
        default(100) }}
   tasks:
     - name: Refresh nova scheduler cell cache
-      import_role:
+      ansible.builtin.import_role:
         name: nova
         tasks_from: refresh_scheduler_cell_cache
       when:
@@ -195,7 +195,7 @@
        default(100) }}
   tasks:
     - name: Reload global nova super conductor services
-      import_role:
+      ansible.builtin.import_role:
         name: nova
         tasks_from: reload_super_conductor
       when:
@@ -224,7 +224,7 @@
        default(100) }}
   tasks:
     - name: Reload nova cell services
-      import_role:
+      ansible.builtin.import_role:
         name: nova-cell
         tasks_from: reload
       when:
@@ -249,7 +249,7 @@
        default(100) }}
   tasks:
     - name: Reload nova API services
-      import_role:
+      ansible.builtin.import_role:
         name: nova
         tasks_from: reload_api
       when:
@@ -274,7 +274,7 @@
   any_errors_fatal: true
   tasks:
     - name: Run nova API online database migration
-      import_role:
+      ansible.builtin.import_role:
         name: nova
         tasks_from: online_data_migrations
       when:
@@ -300,7 +300,7 @@
   any_errors_fatal: true
   tasks:
     - name: Run nova cell online database migrations
-      import_role:
+      ansible.builtin.import_role:
         name: nova-cell
         tasks_from: online_data_migrations
       when:

ansible/post-deploy.yml

@@ -4,20 +4,20 @@
   gather_facts: false
   tasks:
     - name: Get stats of {{ node_config }}
-      stat:
+      ansible.builtin.stat:
         path: "{{ node_config }}"
       register: st
 
     - name: Set become fact
-      set_fact:
+      ansible.builtin.set_fact:
         needs_root: "{{ not (st.stat.writeable | bool) }}"
 
 - name: Creating clouds.yaml file on the deploy node
   hosts: localhost
   tasks:
     - name: Template out clouds.yaml
       become: "{{ needs_root }}"
-      template:
+      ansible.builtin.template:
         src: "roles/common/templates/clouds.yaml.j2"
         dest: "{{ node_config }}/clouds.yaml"
         owner: "{{ ansible_facts.user_uid }}"
@@ -29,7 +29,7 @@
   tasks:
     - name: Template out admin-openrc.sh
       become: "{{ needs_root }}"
-      template:
+      ansible.builtin.template:
         src: "roles/common/templates/admin-openrc.sh.j2"
         dest: "{{ node_config }}/admin-openrc.sh"
         owner: "{{ ansible_facts.user_uid }}"
@@ -38,7 +38,7 @@
 
     - name: Template out admin-openrc-system.sh
       become: "{{ needs_root }}"
-      template:
+      ansible.builtin.template:
         src: "roles/common/templates/admin-openrc-system.sh.j2"
         dest: "{{ node_config }}/admin-openrc-system.sh"
         owner: "{{ ansible_facts.user_uid }}"
@@ -47,7 +47,7 @@
 
     - name: Template out public-openrc.sh
       become: "{{ needs_root }}"
-      template:
+      ansible.builtin.template:
         src: "roles/common/templates/public-openrc.sh.j2"
         dest: "{{ node_config }}/public-openrc.sh"
         owner: "{{ ansible_facts.user_uid }}"
@@ -56,15 +56,15 @@
 
     - name: Template out public-openrc-system.sh
       become: "{{ needs_root }}"
-      template:
+      ansible.builtin.template:
         src: "roles/common/templates/public-openrc-system.sh.j2"
         dest: "{{ node_config }}/public-openrc-system.sh"
         owner: "{{ ansible_facts.user_uid }}"
         group: "{{ ansible_facts.user_gid }}"
         mode: "0600"
 
     - name: Template out octavia-openrc.sh
-      import_role:
+      ansible.builtin.import_role:
         name: octavia
         tasks_from: openrc.yml
       vars:

ansible/rabbitmq-reset-state.yml

@@ -3,7 +3,7 @@
   hosts: rabbitmq
   tasks:
     - name: Include RabbitMQ reset-state tasks
-      include_role:
+      ansible.builtin.include_role:
         name: rabbitmq
         tasks_from: reset-state
       when:

ansible/rabbitmq-upgrade.yml

@@ -11,7 +11,7 @@
        default(100) }}
   tasks:
     - name: Group hosts based on enabled services (RabbitMQ Only)
-      group_by:
+      ansible.builtin.group_by:
         key: "enable_rabbitmq_{{ enable_rabbitmq | bool }}"
       changed_when: false
   tags: always

ansible/rabbitmq.yml

@@ -13,7 +13,7 @@
     - rabbitmq
   tasks:
     - name: Apply rabbitmq role
-      import_role:
+      ansible.builtin.import_role:
         name: rabbitmq
       vars:
         role_rabbitmq_cluster_cookie: "{{ rabbitmq_cluster_cookie }}"
@@ -43,7 +43,7 @@
     - rabbitmq
   tasks:
     - name: Restart rabbitmq services
-      import_role:
+      ansible.builtin.import_role:
         name: rabbitmq
         tasks_from: restart_services.yml
       vars:
@@ -63,7 +63,7 @@
     - rabbitmq
   tasks:
     - name: Include rabbitmq post-deploy.yml
-      include_role:
+      ansible.builtin.include_role:
         name: rabbitmq
         tasks_from: post-deploy.yml
       when: kolla_action in ['deploy', 'reconfigure', 'upgrade']

ansible/roles/aodh/tasks/bootstrap.yml

@@ -38,4 +38,4 @@
     - not use_preconfigured_databases | bool
 
 - name: Run aodh bootstrap container
-  import_tasks: bootstrap_service.yml
+  ansible.builtin.import_tasks: bootstrap_service.yml

ansible/roles/aodh/tasks/check-containers.yml

@@ -1,4 +1,4 @@
 ---
 - name: Check aodh containers
-  import_role:
+  ansible.builtin.import_role:
     name: service-check-containers

ansible/roles/aodh/tasks/check.yml

@@ -1,4 +1,4 @@
 ---
 - name: Checking Aodh containers
-  import_role:
+  ansible.builtin.import_role:
     role: service-check

ansible/roles/aodh/tasks/clone.yml

@@ -1,7 +1,7 @@
 ---
 - name: Cloning aodh source repository for development
   become: true
-  git:
+  ansible.builtin.git:
     repo: "{{ aodh_git_repository }}"
     dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
     update: "{{ aodh_dev_repos_pull }}"

ansible/roles/aodh/tasks/config.yml

@@ -1,6 +1,6 @@
 ---
 - name: Ensuring config directories exist
-  file:
+  ansible.builtin.file:
     path: "{{ node_config_directory }}/{{ item.key }}"
     state: "directory"
     owner: "{{ config_owner_user }}"
@@ -10,7 +10,7 @@
   with_dict: "{{ aodh_services | select_services_enabled_and_mapped_to_host }}"
 
 - name: Check if policies shall be overwritten
-  stat:
+  ansible.builtin.stat:
     path: "{{ item }}"
   run_once: true
   delegate_to: localhost
@@ -22,14 +22,14 @@
       skip: true
 
 - name: Set aodh policy file
-  set_fact:
+  ansible.builtin.set_fact:
     aodh_policy_file: "{{ aodh_policy.results.0.stat.path | basename }}"
     aodh_policy_file_path: "{{ aodh_policy.results.0.stat.path }}"
   when:
     - aodh_policy.results | length > 0
 
 - name: Copying over existing policy file
-  template:
+  ansible.builtin.template:
     src: "{{ aodh_policy_file_path }}"
     dest: "{{ node_config_directory }}/{{ item.key }}/{{ aodh_policy_file }}"
     mode: "0660"
@@ -39,12 +39,12 @@
   with_dict: "{{ aodh_services | select_services_enabled_and_mapped_to_host }}"
 
 - name: Copying over TLS certificates
-  include_tasks: copy-certs.yml
+  ansible.builtin.include_tasks: copy-certs.yml
   when:
     - aodh_copy_certs | bool
 
 - name: Copying over config.json files for services
-  template:
+  ansible.builtin.template:
     src: "{{ item.key }}.json.j2"
     dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
     mode: "0660"
@@ -67,7 +67,7 @@
   with_dict: "{{ aodh_services | select_services_enabled_and_mapped_to_host }}"
 
 - name: "Configure uWSGI for {{ project_name }}"
-  include_role:
+  ansible.builtin.include_role:
     name: service-uwsgi-config
   vars:
     project_services: "{{ aodh_services }}"
@@ -84,7 +84,7 @@
 - name: Copying over wsgi-aodh files for services
   vars:
     service: "{{ aodh_services['aodh-api'] }}"
-  template:
+  ansible.builtin.template:
     src: "wsgi-aodh.conf.j2"
     dest: "{{ node_config_directory }}/aodh-api/wsgi-aodh.conf"
     mode: "0660"