diff --git a/.ansible-lint b/.ansible-lint index 2f5285d8f8..2e1a9d6f94 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -9,9 +9,6 @@ exclude_paths: strict: false use_default_rules: true skip_list: - # [unnamed-task] All tasks should be named - # FIXME(mgoddard): Add names to all tasks - - unnamed-task # disable experimental rules - experimental # NOTE(frickler): Agreed at Zed PTG not to use FQCN for builtin actions for now, due to diff --git a/ansible/mariadb.yml b/ansible/mariadb.yml index 2e63236ece..2024a2a4af 100644 --- a/ansible/mariadb.yml +++ b/ansible/mariadb.yml @@ -12,7 +12,8 @@ tags: - mariadb tasks: - - import_role: + - name: Apply mariadb role + import_role: name: mariadb - name: Restart mariadb services @@ -29,7 +30,8 @@ tags: - mariadb tasks: - - import_role: + - name: Restart mariadb services + import_role: name: mariadb tasks_from: restart_services.yml @@ -47,7 +49,8 @@ tags: - mariadb tasks: - - import_role: + - name: Start mariadb services + import_role: name: mariadb tasks_from: restart_services.yml @@ -63,7 +66,8 @@ tags: - mariadb tasks: - - import_role: + - name: Restart bootstrap mariadb service + import_role: name: mariadb tasks_from: restart_services.yml diff --git a/ansible/nova-libvirt-cleanup.yml b/ansible/nova-libvirt-cleanup.yml index 4ce377264a..638e9bbcb4 100644 --- a/ansible/nova-libvirt-cleanup.yml +++ b/ansible/nova-libvirt-cleanup.yml @@ -14,6 +14,7 @@ tags: - nova-libvirt-cleanup tasks: - - import_role: + - name: Clean up nova libvirt container and configuration + import_role: name: nova-cell tasks_from: libvirt-cleanup.yml diff --git a/ansible/nova.yml b/ansible/nova.yml index cff3a52c3b..95eb6a141a 100644 --- a/ansible/nova.yml +++ b/ansible/nova.yml @@ -164,7 +164,8 @@ default(kolla_max_fail_percentage) | default(100) }} tasks: - - import_role: + - name: Refresh nova scheduler cell cache + import_role: name: nova tasks_from: refresh_scheduler_cell_cache when: @@ -193,7 +194,8 @@ default(kolla_max_fail_percentage) | default(100) }} tasks: - - import_role: + - name: Reload global nova super conductor services + import_role: name: nova tasks_from: reload_super_conductor when: @@ -221,7 +223,8 @@ default(kolla_max_fail_percentage) | default(100) }} tasks: - - import_role: + - name: Reload nova cell services + import_role: name: nova-cell tasks_from: reload when: @@ -245,7 +248,8 @@ default(kolla_max_fail_percentage) | default(100) }} tasks: - - import_role: + - name: Reload nova API services + import_role: name: nova tasks_from: reload_api when: @@ -269,7 +273,8 @@ # Fail all hosts if any of these once-per-cell tasks fails. any_errors_fatal: true tasks: - - import_role: + - name: Run nova API online database migration + import_role: name: nova tasks_from: online_data_migrations when: @@ -294,7 +299,8 @@ # Fail all hosts if any of these once-per-cell tasks fails. any_errors_fatal: true tasks: - - import_role: + - name: Run nova cell online database migrations + import_role: name: nova-cell tasks_from: online_data_migrations when: diff --git a/ansible/post-deploy.yml b/ansible/post-deploy.yml index ba009aba04..93c24cc772 100644 --- a/ansible/post-deploy.yml +++ b/ansible/post-deploy.yml @@ -63,7 +63,8 @@ group: "{{ ansible_facts.user_gid }}" mode: "0600" - - import_role: + - name: Template out octavia-openrc.sh + import_role: name: octavia tasks_from: openrc.yml vars: diff --git a/ansible/rabbitmq.yml b/ansible/rabbitmq.yml index f21f6b9e83..c0c3adba5f 100644 --- a/ansible/rabbitmq.yml +++ b/ansible/rabbitmq.yml @@ -12,7 +12,8 @@ tags: - rabbitmq tasks: - - import_role: + - name: Apply rabbitmq role + import_role: name: rabbitmq vars: role_rabbitmq_cluster_cookie: "{{ rabbitmq_cluster_cookie }}" @@ -41,7 +42,8 @@ tags: - rabbitmq tasks: - - import_role: + - name: Restart rabbitmq services + import_role: name: rabbitmq tasks_from: restart_services.yml vars: diff --git a/ansible/roles/aodh/tasks/bootstrap.yml b/ansible/roles/aodh/tasks/bootstrap.yml index 7c69af01ae..5c6a46098c 100644 --- a/ansible/roles/aodh/tasks/bootstrap.yml +++ b/ansible/roles/aodh/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run aodh bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/aodh/tasks/check-containers.yml b/ansible/roles/aodh/tasks/check-containers.yml index b7e2f7c29f..a9d8bf8d81 100644 --- a/ansible/roles/aodh/tasks/check-containers.yml +++ b/ansible/roles/aodh/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check aodh containers + import_role: name: service-check-containers diff --git a/ansible/roles/aodh/tasks/config.yml b/ansible/roles/aodh/tasks/config.yml index 35dea6922a..f51626eaf2 100644 --- a/ansible/roles/aodh/tasks/config.yml +++ b/ansible/roles/aodh/tasks/config.yml @@ -38,7 +38,8 @@ - aodh_policy_file is defined with_dict: "{{ aodh_services | select_services_enabled_and_mapped_to_host }}" -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - aodh_copy_certs | bool diff --git a/ansible/roles/aodh/tasks/config_validate.yml b/ansible/roles/aodh/tasks/config_validate.yml index 887b3cf0e5..12dde59b8c 100644 --- a/ansible/roles/aodh/tasks/config_validate.yml +++ b/ansible/roles/aodh/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate aodh configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ aodh_services }}" diff --git a/ansible/roles/aodh/tasks/deploy-containers.yml b/ansible/roles/aodh/tasks/deploy-containers.yml index eb24ab5c7a..5f6b6c6e66 100644 --- a/ansible/roles/aodh/tasks/deploy-containers.yml +++ b/ansible/roles/aodh/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check aodh containers + import_tasks: check-containers.yml diff --git a/ansible/roles/aodh/tasks/deploy.yml b/ansible/roles/aodh/tasks/deploy.yml index 92e7fce2af..b5edd3b262 100644 --- a/ansible/roles/aodh/tasks/deploy.yml +++ b/ansible/roles/aodh/tasks/deploy.yml @@ -1,14 +1,19 @@ --- -- import_tasks: register.yml +- name: Register aodh in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure aodh + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check aodh containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone aodh repository + include_tasks: clone.yml when: aodh_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap aodh service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/aodh/tasks/main.yml b/ansible/roles/aodh/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/aodh/tasks/main.yml +++ b/ansible/roles/aodh/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/aodh/tasks/precheck.yml b/ansible/roles/aodh/tasks/precheck.yml index d64bb75ae1..415ff7b010 100644 --- a/ansible/roles/aodh/tasks/precheck.yml +++ b/ansible/roles/aodh/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck aodh configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ aodh_services }}" diff --git a/ansible/roles/aodh/tasks/pull.yml b/ansible/roles/aodh/tasks/pull.yml index 53f9c5fda1..f73eaca509 100644 --- a/ansible/roles/aodh/tasks/pull.yml +++ b/ansible/roles/aodh/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull aodh images + import_role: role: service-images-pull diff --git a/ansible/roles/aodh/tasks/reconfigure.yml b/ansible/roles/aodh/tasks/reconfigure.yml index 5b10a7e111..12f1eb4fba 100644 --- a/ansible/roles/aodh/tasks/reconfigure.yml +++ b/ansible/roles/aodh/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy aodh + import_tasks: deploy.yml diff --git a/ansible/roles/aodh/tasks/register.yml b/ansible/roles/aodh/tasks/register.yml index 59b4bc4c4a..fe54b9e764 100644 --- a/ansible/roles/aodh/tasks/register.yml +++ b/ansible/roles/aodh/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register aodh service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_aodh_auth }}" diff --git a/ansible/roles/aodh/tasks/stop.yml b/ansible/roles/aodh/tasks/stop.yml index eca45ee0fe..ba791d1951 100644 --- a/ansible/roles/aodh/tasks/stop.yml +++ b/ansible/roles/aodh/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop aodh containers + import_role: name: service-stop vars: project_services: "{{ aodh_services }}" diff --git a/ansible/roles/aodh/tasks/upgrade.yml b/ansible/roles/aodh/tasks/upgrade.yml index 6ba9f99799..e7648fb54c 100644 --- a/ansible/roles/aodh/tasks/upgrade.yml +++ b/ansible/roles/aodh/tasks/upgrade.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure aodh + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check aodh containers + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Run aodh bootstrap container + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/barbican/tasks/bootstrap.yml b/ansible/roles/barbican/tasks/bootstrap.yml index 177ae74660..540fcf8a1b 100644 --- a/ansible/roles/barbican/tasks/bootstrap.yml +++ b/ansible/roles/barbican/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run barbican bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/barbican/tasks/check-containers.yml b/ansible/roles/barbican/tasks/check-containers.yml index b7e2f7c29f..0a84779cba 100644 --- a/ansible/roles/barbican/tasks/check-containers.yml +++ b/ansible/roles/barbican/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check barbican containers + import_role: name: service-check-containers diff --git a/ansible/roles/barbican/tasks/config.yml b/ansible/roles/barbican/tasks/config.yml index f3c5cb48d4..b9bd51c69e 100644 --- a/ansible/roles/barbican/tasks/config.yml +++ b/ansible/roles/barbican/tasks/config.yml @@ -42,7 +42,8 @@ when: - barbican_policy.results | length > 0 -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - barbican_copy_certs | bool diff --git a/ansible/roles/barbican/tasks/config_validate.yml b/ansible/roles/barbican/tasks/config_validate.yml index 31143931f7..6403b8a4a4 100644 --- a/ansible/roles/barbican/tasks/config_validate.yml +++ b/ansible/roles/barbican/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate barbican configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ barbican_services }}" diff --git a/ansible/roles/barbican/tasks/deploy-containers.yml b/ansible/roles/barbican/tasks/deploy-containers.yml index eb24ab5c7a..d935ea81d3 100644 --- a/ansible/roles/barbican/tasks/deploy-containers.yml +++ b/ansible/roles/barbican/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check barbican containers + import_tasks: check-containers.yml diff --git a/ansible/roles/barbican/tasks/deploy.yml b/ansible/roles/barbican/tasks/deploy.yml index ae69a9e0ce..0de0f2974f 100644 --- a/ansible/roles/barbican/tasks/deploy.yml +++ b/ansible/roles/barbican/tasks/deploy.yml @@ -1,14 +1,19 @@ --- -- import_tasks: register.yml +- name: Register barbican in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure barbican + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check barbican containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone barbican repository + include_tasks: clone.yml when: barbican_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap barbican service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/barbican/tasks/main.yml b/ansible/roles/barbican/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/barbican/tasks/main.yml +++ b/ansible/roles/barbican/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/barbican/tasks/precheck.yml b/ansible/roles/barbican/tasks/precheck.yml index 1df9761538..34797c59ba 100644 --- a/ansible/roles/barbican/tasks/precheck.yml +++ b/ansible/roles/barbican/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck barbican configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ barbican_services }}" diff --git a/ansible/roles/barbican/tasks/pull.yml b/ansible/roles/barbican/tasks/pull.yml index 53f9c5fda1..a61db13c06 100644 --- a/ansible/roles/barbican/tasks/pull.yml +++ b/ansible/roles/barbican/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull barbican images + import_role: role: service-images-pull diff --git a/ansible/roles/barbican/tasks/reconfigure.yml b/ansible/roles/barbican/tasks/reconfigure.yml index 5b10a7e111..cc6f6f3c67 100644 --- a/ansible/roles/barbican/tasks/reconfigure.yml +++ b/ansible/roles/barbican/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy barbican + import_tasks: deploy.yml diff --git a/ansible/roles/barbican/tasks/register.yml b/ansible/roles/barbican/tasks/register.yml index 40eae43b09..20442acc4a 100644 --- a/ansible/roles/barbican/tasks/register.yml +++ b/ansible/roles/barbican/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register barbican service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_barbican_auth }}" diff --git a/ansible/roles/barbican/tasks/stop.yml b/ansible/roles/barbican/tasks/stop.yml index 2565578cb2..06635c23d0 100644 --- a/ansible/roles/barbican/tasks/stop.yml +++ b/ansible/roles/barbican/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop barbican containers + import_role: name: service-stop vars: project_services: "{{ barbican_services }}" diff --git a/ansible/roles/barbican/tasks/upgrade.yml b/ansible/roles/barbican/tasks/upgrade.yml index 6ba9f99799..b876e1b2c8 100644 --- a/ansible/roles/barbican/tasks/upgrade.yml +++ b/ansible/roles/barbican/tasks/upgrade.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure barbican + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check barbican containers + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Run barbican bootstrap container + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/bifrost/tasks/deploy.yml b/ansible/roles/bifrost/tasks/deploy.yml index 922fca8b55..90f076c457 100644 --- a/ansible/roles/bifrost/tasks/deploy.yml +++ b/ansible/roles/bifrost/tasks/deploy.yml @@ -1,6 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure bifrost + import_tasks: config.yml -- import_tasks: start.yml +- name: Start bifrost containers + import_tasks: start.yml -- import_tasks: bootstrap.yml +- name: Bootstrap bifrost service + import_tasks: bootstrap.yml diff --git a/ansible/roles/bifrost/tasks/main.yml b/ansible/roles/bifrost/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/bifrost/tasks/main.yml +++ b/ansible/roles/bifrost/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/bifrost/tasks/reconfigure.yml b/ansible/roles/bifrost/tasks/reconfigure.yml index 8cfd919657..962851ed6e 100644 --- a/ansible/roles/bifrost/tasks/reconfigure.yml +++ b/ansible/roles/bifrost/tasks/reconfigure.yml @@ -11,7 +11,8 @@ with_items: - { name: bifrost-deploy, group: bifrost-deploy } -- import_tasks: config.yml +- name: Configure bifrost + import_tasks: config.yml - name: Check the configs become: true @@ -56,7 +57,8 @@ - "{{ container_envs.results }}" - "{{ check_results.results }}" -- include_tasks: start.yml +- name: Start bifrost containers + include_tasks: start.yml when: remove_containers.changed # noqa no-handler - name: Restart containers diff --git a/ansible/roles/bifrost/tasks/stop.yml b/ansible/roles/bifrost/tasks/stop.yml index d47a24cae5..1ea3648e14 100644 --- a/ansible/roles/bifrost/tasks/stop.yml +++ b/ansible/roles/bifrost/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- when: +- name: Stop bifrost containers + when: - inventory_hostname in groups['bifrost'] - "'bifrost_deploy' not in skip_stop_containers" block: @@ -12,7 +13,8 @@ - bifrost_deploy register: container_facts - - when: container_facts.containers['bifrost_deploy'] is defined + - name: Stop bifrost services + when: container_facts.containers['bifrost_deploy'] is defined block: # Ensure that all services are stopped gracefully, and in a sensible # order. diff --git a/ansible/roles/bifrost/tasks/upgrade.yml b/ansible/roles/bifrost/tasks/upgrade.yml index 8888b58aa8..c2203cc879 100644 --- a/ansible/roles/bifrost/tasks/upgrade.yml +++ b/ansible/roles/bifrost/tasks/upgrade.yml @@ -1,5 +1,7 @@ --- # Stop the container prior to redeploying it. -- import_tasks: stop.yml +- name: Stop bifrost containers + import_tasks: stop.yml -- import_tasks: deploy.yml +- name: Deploy bifrost + import_tasks: deploy.yml diff --git a/ansible/roles/blazar/tasks/bootstrap.yml b/ansible/roles/blazar/tasks/bootstrap.yml index c8e1eab3ff..318d63c3b1 100644 --- a/ansible/roles/blazar/tasks/bootstrap.yml +++ b/ansible/roles/blazar/tasks/bootstrap.yml @@ -51,4 +51,5 @@ run_once: true delegate_to: "{{ groups['blazar-api'][0] }}" -- import_tasks: bootstrap_service.yml +- name: Run blazar bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/blazar/tasks/check-containers.yml b/ansible/roles/blazar/tasks/check-containers.yml index b7e2f7c29f..4d0cc0e4e8 100644 --- a/ansible/roles/blazar/tasks/check-containers.yml +++ b/ansible/roles/blazar/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check blazar containers + import_role: name: service-check-containers diff --git a/ansible/roles/blazar/tasks/config.yml b/ansible/roles/blazar/tasks/config.yml index 086a36cac1..5d1dc74c8d 100644 --- a/ansible/roles/blazar/tasks/config.yml +++ b/ansible/roles/blazar/tasks/config.yml @@ -28,7 +28,8 @@ when: - blazar_policy.results | length > 0 -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - blazar_copy_certs | bool diff --git a/ansible/roles/blazar/tasks/config_validate.yml b/ansible/roles/blazar/tasks/config_validate.yml index 9a18ef3d5f..c3b6382cd8 100644 --- a/ansible/roles/blazar/tasks/config_validate.yml +++ b/ansible/roles/blazar/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate blazar configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ blazar_services }}" diff --git a/ansible/roles/blazar/tasks/deploy-containers.yml b/ansible/roles/blazar/tasks/deploy-containers.yml index eb24ab5c7a..f0ac13641a 100644 --- a/ansible/roles/blazar/tasks/deploy-containers.yml +++ b/ansible/roles/blazar/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check blazar containers + import_tasks: check-containers.yml diff --git a/ansible/roles/blazar/tasks/deploy.yml b/ansible/roles/blazar/tasks/deploy.yml index 27c21e9dfb..3395a815c4 100644 --- a/ansible/roles/blazar/tasks/deploy.yml +++ b/ansible/roles/blazar/tasks/deploy.yml @@ -1,14 +1,19 @@ --- -- import_tasks: register.yml +- name: Register blazar in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure blazar + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check blazar containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone blazar repository + include_tasks: clone.yml when: blazar_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap blazar service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/blazar/tasks/main.yml b/ansible/roles/blazar/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/blazar/tasks/main.yml +++ b/ansible/roles/blazar/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/blazar/tasks/precheck.yml b/ansible/roles/blazar/tasks/precheck.yml index 63aff1d877..7f9db1e962 100644 --- a/ansible/roles/blazar/tasks/precheck.yml +++ b/ansible/roles/blazar/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck blazar configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ blazar_services }}" diff --git a/ansible/roles/blazar/tasks/pull.yml b/ansible/roles/blazar/tasks/pull.yml index 53f9c5fda1..377926295d 100644 --- a/ansible/roles/blazar/tasks/pull.yml +++ b/ansible/roles/blazar/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull blazar images + import_role: role: service-images-pull diff --git a/ansible/roles/blazar/tasks/reconfigure.yml b/ansible/roles/blazar/tasks/reconfigure.yml index 5b10a7e111..10b685ebff 100644 --- a/ansible/roles/blazar/tasks/reconfigure.yml +++ b/ansible/roles/blazar/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy blazar + import_tasks: deploy.yml diff --git a/ansible/roles/blazar/tasks/register.yml b/ansible/roles/blazar/tasks/register.yml index 73c675d4d5..f0200b7750 100644 --- a/ansible/roles/blazar/tasks/register.yml +++ b/ansible/roles/blazar/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register blazar service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_blazar_auth }}" diff --git a/ansible/roles/blazar/tasks/stop.yml b/ansible/roles/blazar/tasks/stop.yml index 79dd48743e..91183d3a9b 100644 --- a/ansible/roles/blazar/tasks/stop.yml +++ b/ansible/roles/blazar/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop blazar containers + import_role: name: service-stop vars: project_services: "{{ blazar_services }}" diff --git a/ansible/roles/blazar/tasks/upgrade.yml b/ansible/roles/blazar/tasks/upgrade.yml index 6ba9f99799..cf1b8152fd 100644 --- a/ansible/roles/blazar/tasks/upgrade.yml +++ b/ansible/roles/blazar/tasks/upgrade.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure blazar + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check blazar containers + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Run blazar bootstrap container + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/ceilometer/tasks/bootstrap.yml b/ansible/roles/ceilometer/tasks/bootstrap.yml index 581e7ff2a6..e2410d0906 100644 --- a/ansible/roles/ceilometer/tasks/bootstrap.yml +++ b/ansible/roles/ceilometer/tasks/bootstrap.yml @@ -1,3 +1,4 @@ --- # TODO(Jeffrey4l): fix idempotent -- import_tasks: bootstrap_service.yml +- name: Run ceilometer bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/ceilometer/tasks/check-containers.yml b/ansible/roles/ceilometer/tasks/check-containers.yml index b7e2f7c29f..0e1edc02d9 100644 --- a/ansible/roles/ceilometer/tasks/check-containers.yml +++ b/ansible/roles/ceilometer/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check ceilometer containers + import_role: name: service-check-containers diff --git a/ansible/roles/ceilometer/tasks/config.yml b/ansible/roles/ceilometer/tasks/config.yml index 41c0725257..f17be7c125 100644 --- a/ansible/roles/ceilometer/tasks/config.yml +++ b/ansible/roles/ceilometer/tasks/config.yml @@ -157,7 +157,8 @@ when: - ceilometer_policy.results | length > 0 -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - ceilometer_copy_certs | bool diff --git a/ansible/roles/ceilometer/tasks/config_validate.yml b/ansible/roles/ceilometer/tasks/config_validate.yml index ef646be6b3..e91550c876 100644 --- a/ansible/roles/ceilometer/tasks/config_validate.yml +++ b/ansible/roles/ceilometer/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate ceilometer configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ ceilometer_services }}" diff --git a/ansible/roles/ceilometer/tasks/deploy-containers.yml b/ansible/roles/ceilometer/tasks/deploy-containers.yml index eb24ab5c7a..04fe3ef2cc 100644 --- a/ansible/roles/ceilometer/tasks/deploy-containers.yml +++ b/ansible/roles/ceilometer/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check ceilometer containers + import_tasks: check-containers.yml diff --git a/ansible/roles/ceilometer/tasks/deploy.yml b/ansible/roles/ceilometer/tasks/deploy.yml index 59e691146e..fcafcb739e 100644 --- a/ansible/roles/ceilometer/tasks/deploy.yml +++ b/ansible/roles/ceilometer/tasks/deploy.yml @@ -1,14 +1,19 @@ --- -- import_tasks: register.yml +- name: Register ceilometer in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure ceilometer + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check ceilometer containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone ceilometer repository + include_tasks: clone.yml when: ceilometer_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap ceilometer service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/ceilometer/tasks/main.yml b/ansible/roles/ceilometer/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/ceilometer/tasks/main.yml +++ b/ansible/roles/ceilometer/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/ceilometer/tasks/precheck.yml b/ansible/roles/ceilometer/tasks/precheck.yml index 7a1aa6bf55..cc6fb06b41 100644 --- a/ansible/roles/ceilometer/tasks/precheck.yml +++ b/ansible/roles/ceilometer/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck ceilometer configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ ceilometer_services }}" diff --git a/ansible/roles/ceilometer/tasks/pull.yml b/ansible/roles/ceilometer/tasks/pull.yml index 53f9c5fda1..3675f59606 100644 --- a/ansible/roles/ceilometer/tasks/pull.yml +++ b/ansible/roles/ceilometer/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull ceilometer images + import_role: role: service-images-pull diff --git a/ansible/roles/ceilometer/tasks/reconfigure.yml b/ansible/roles/ceilometer/tasks/reconfigure.yml index 5b10a7e111..1a01c7f16d 100644 --- a/ansible/roles/ceilometer/tasks/reconfigure.yml +++ b/ansible/roles/ceilometer/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy ceilometer + import_tasks: deploy.yml diff --git a/ansible/roles/ceilometer/tasks/register.yml b/ansible/roles/ceilometer/tasks/register.yml index 0fbf1129fd..1fbeac607b 100644 --- a/ansible/roles/ceilometer/tasks/register.yml +++ b/ansible/roles/ceilometer/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register ceilometer service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_ceilometer_auth }}" diff --git a/ansible/roles/ceilometer/tasks/stop.yml b/ansible/roles/ceilometer/tasks/stop.yml index 62431fde12..e03f35cdc4 100644 --- a/ansible/roles/ceilometer/tasks/stop.yml +++ b/ansible/roles/ceilometer/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop ceilometer containers + import_role: name: service-stop vars: project_services: "{{ ceilometer_services }}" diff --git a/ansible/roles/ceilometer/tasks/upgrade.yml b/ansible/roles/ceilometer/tasks/upgrade.yml index 6ba9f99799..d39ff1aa47 100644 --- a/ansible/roles/ceilometer/tasks/upgrade.yml +++ b/ansible/roles/ceilometer/tasks/upgrade.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure ceilometer + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check ceilometer containers + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Run ceilometer bootstrap container + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/ceph-rgw/tasks/deploy.yml b/ansible/roles/ceph-rgw/tasks/deploy.yml index 40daddd63b..ac8dea511c 100644 --- a/ansible/roles/ceph-rgw/tasks/deploy.yml +++ b/ansible/roles/ceph-rgw/tasks/deploy.yml @@ -1,2 +1,3 @@ --- -- import_tasks: register.yml +- name: Register ceph-rgw in Keystone + import_tasks: register.yml diff --git a/ansible/roles/ceph-rgw/tasks/main.yml b/ansible/roles/ceph-rgw/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/ceph-rgw/tasks/main.yml +++ b/ansible/roles/ceph-rgw/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/ceph-rgw/tasks/reconfigure.yml b/ansible/roles/ceph-rgw/tasks/reconfigure.yml index 5b10a7e111..bdbb09ded4 100644 --- a/ansible/roles/ceph-rgw/tasks/reconfigure.yml +++ b/ansible/roles/ceph-rgw/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy ceph-rgw + import_tasks: deploy.yml diff --git a/ansible/roles/ceph-rgw/tasks/register.yml b/ansible/roles/ceph-rgw/tasks/register.yml index c33683163c..f878bf06a2 100644 --- a/ansible/roles/ceph-rgw/tasks/register.yml +++ b/ansible/roles/ceph-rgw/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register ceph-rgw service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_ceph_rgw_auth }}" diff --git a/ansible/roles/certificates/tasks/generate.yml b/ansible/roles/certificates/tasks/generate.yml index 542603d45d..68af5f9b2d 100644 --- a/ansible/roles/certificates/tasks/generate.yml +++ b/ansible/roles/certificates/tasks/generate.yml @@ -11,7 +11,8 @@ state: "directory" mode: "0770" -- when: +- name: Generate external SSL certificates + when: - letsencrypt_managed_certs == 'internal' or letsencrypt_managed_certs == '' or database_enable_tls_internal | bool - kolla_enable_tls_external | bool or database_enable_tls_internal | bool block: @@ -73,7 +74,8 @@ - letsencrypt_managed_certs == 'internal' or letsencrypt_managed_certs == '' - kolla_enable_tls_external | bool -- when: +- name: Copy external certificates for ProxySQL + when: - database_enable_tls_internal | bool - kolla_same_external_internal_vip | bool block: @@ -101,7 +103,8 @@ - kolla_enable_tls_internal | bool - kolla_same_external_internal_vip | bool -- when: +- name: Generate internal SSL certificates + when: - letsencrypt_managed_certs == 'external' or letsencrypt_managed_certs == '' or database_enable_tls_internal | bool - kolla_enable_tls_internal | bool or database_enable_tls_internal | bool - not kolla_same_external_internal_vip | bool @@ -165,7 +168,8 @@ - kolla_enable_tls_internal | bool - not kolla_same_external_internal_vip | bool -- when: +- name: Copy internal certificates for ProxySQL + when: - database_enable_tls_internal | bool - not kolla_same_external_internal_vip | bool block: diff --git a/ansible/roles/certificates/tasks/main.yml b/ansible/roles/certificates/tasks/main.yml index e0aa890982..e3ac17aa49 100644 --- a/ansible/roles/certificates/tasks/main.yml +++ b/ansible/roles/certificates/tasks/main.yml @@ -1,8 +1,12 @@ --- -- include_tasks: generate-root.yml -- include_tasks: generate.yml -- include_tasks: generate-backend.yml +- name: Generate root certificates + include_tasks: generate-root.yml +- name: Generate certificates + include_tasks: generate.yml +- name: Generate backend certificates + include_tasks: generate-backend.yml when: - kolla_enable_tls_backend | bool or rabbitmq_enable_tls | bool or database_enable_tls_backend | bool -- include_tasks: generate-libvirt.yml +- name: Generate libvirt certificates + include_tasks: generate-libvirt.yml when: certificates_generate_libvirt | bool diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml index 303de67c10..cdcd692281 100644 --- a/ansible/roles/cinder/tasks/bootstrap.yml +++ b/ansible/roles/cinder/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run cinder bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/cinder/tasks/check-containers.yml b/ansible/roles/cinder/tasks/check-containers.yml index b7e2f7c29f..28357439d0 100644 --- a/ansible/roles/cinder/tasks/check-containers.yml +++ b/ansible/roles/cinder/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check cinder containers + import_role: name: service-check-containers diff --git a/ansible/roles/cinder/tasks/config.yml b/ansible/roles/cinder/tasks/config.yml index 8bee34fdfc..d63894fd7b 100644 --- a/ansible/roles/cinder/tasks/config.yml +++ b/ansible/roles/cinder/tasks/config.yml @@ -9,13 +9,15 @@ become: true with_dict: "{{ cinder_services | select_services_enabled_and_mapped_to_host }}" -- include_tasks: external_huawei.yml +- name: Configure external Huawei backend + include_tasks: external_huawei.yml when: - cinder_backend_huawei | bool - cinder_backend_huawei_xml_files | length > 0 - inventory_hostname in groups['cinder-volume'] -- include_tasks: external_ceph.yml +- name: Configure external Ceph backend + include_tasks: external_ceph.yml when: - cinder_backend_ceph | bool - inventory_hostname in groups['cinder-volume'] or inventory_hostname in groups['cinder-backup'] @@ -39,7 +41,8 @@ when: - cinder_policy.results | length > 0 -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - cinder_copy_certs | bool diff --git a/ansible/roles/cinder/tasks/config_validate.yml b/ansible/roles/cinder/tasks/config_validate.yml index 1c9b602455..f22620cdaf 100644 --- a/ansible/roles/cinder/tasks/config_validate.yml +++ b/ansible/roles/cinder/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate cinder configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ cinder_services }}" diff --git a/ansible/roles/cinder/tasks/deploy-containers.yml b/ansible/roles/cinder/tasks/deploy-containers.yml index eb24ab5c7a..d66a46a336 100644 --- a/ansible/roles/cinder/tasks/deploy-containers.yml +++ b/ansible/roles/cinder/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check cinder containers + import_tasks: check-containers.yml diff --git a/ansible/roles/cinder/tasks/deploy.yml b/ansible/roles/cinder/tasks/deploy.yml index f5deb72f6a..972afb86d9 100644 --- a/ansible/roles/cinder/tasks/deploy.yml +++ b/ansible/roles/cinder/tasks/deploy.yml @@ -1,14 +1,19 @@ --- -- import_tasks: register.yml +- name: Register cinder in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure cinder + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check cinder containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone cinder repository + include_tasks: clone.yml when: cinder_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap cinder service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/cinder/tasks/main.yml b/ansible/roles/cinder/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/cinder/tasks/main.yml +++ b/ansible/roles/cinder/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/cinder/tasks/precheck.yml b/ansible/roles/cinder/tasks/precheck.yml index 764498f538..5a7988e74f 100644 --- a/ansible/roles/cinder/tasks/precheck.yml +++ b/ansible/roles/cinder/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck cinder configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ cinder_services }}" diff --git a/ansible/roles/cinder/tasks/pull.yml b/ansible/roles/cinder/tasks/pull.yml index 53f9c5fda1..3f0559f602 100644 --- a/ansible/roles/cinder/tasks/pull.yml +++ b/ansible/roles/cinder/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull cinder images + import_role: role: service-images-pull diff --git a/ansible/roles/cinder/tasks/reconfigure.yml b/ansible/roles/cinder/tasks/reconfigure.yml index 5b10a7e111..3968470a84 100644 --- a/ansible/roles/cinder/tasks/reconfigure.yml +++ b/ansible/roles/cinder/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy cinder + import_tasks: deploy.yml diff --git a/ansible/roles/cinder/tasks/register.yml b/ansible/roles/cinder/tasks/register.yml index d090b30d8e..5f49ed6c91 100644 --- a/ansible/roles/cinder/tasks/register.yml +++ b/ansible/roles/cinder/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register cinder service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_cinder_auth }}" diff --git a/ansible/roles/cinder/tasks/stop.yml b/ansible/roles/cinder/tasks/stop.yml index 6424c5a2fb..30f437af83 100644 --- a/ansible/roles/cinder/tasks/stop.yml +++ b/ansible/roles/cinder/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop cinder containers + import_role: name: service-stop vars: project_services: "{{ cinder_services }}" diff --git a/ansible/roles/cinder/tasks/upgrade.yml b/ansible/roles/cinder/tasks/upgrade.yml index 0775f46664..ec939fac14 100644 --- a/ansible/roles/cinder/tasks/upgrade.yml +++ b/ansible/roles/cinder/tasks/upgrade.yml @@ -1,19 +1,24 @@ --- # NOTE (duonghq): I break config into 2 phases to prevent new version # of service start if node or process in node crash accidentally. -- include_tasks: config.yml +- name: Configure cinder + include_tasks: config.yml when: inventory_hostname == groups["cinder-api"][0] -- import_tasks: bootstrap_service.yml +- name: Run cinder bootstrap container + import_tasks: bootstrap_service.yml -- import_tasks: config.yml +- name: Configure cinder + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check cinder containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers -- import_tasks: reload.yml +- name: Reload cinder services + import_tasks: reload.yml - name: Running Cinder online schema migration vars: diff --git a/ansible/roles/cloudkitty/tasks/bootstrap.yml b/ansible/roles/cloudkitty/tasks/bootstrap.yml index 78e381e199..a4648c4899 100644 --- a/ansible/roles/cloudkitty/tasks/bootstrap.yml +++ b/ansible/roles/cloudkitty/tasks/bootstrap.yml @@ -118,4 +118,5 @@ - cloudkitty_storage_backend == 'opensearch' - cloudkitty_index_opensearch.get('status') != 200 -- import_tasks: bootstrap_service.yml +- name: Run cloudkitty bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/cloudkitty/tasks/check-containers.yml b/ansible/roles/cloudkitty/tasks/check-containers.yml index b7e2f7c29f..21130233f9 100644 --- a/ansible/roles/cloudkitty/tasks/check-containers.yml +++ b/ansible/roles/cloudkitty/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check cloudkitty containers + import_role: name: service-check-containers diff --git a/ansible/roles/cloudkitty/tasks/config.yml b/ansible/roles/cloudkitty/tasks/config.yml index 806d7d93eb..d67928cbb0 100644 --- a/ansible/roles/cloudkitty/tasks/config.yml +++ b/ansible/roles/cloudkitty/tasks/config.yml @@ -48,7 +48,8 @@ set_fact: cloudkitty_custom_metrics_used: "{{ cloudkitty_custom_metrics_file.stat.exists }}" -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - cloudkitty_copy_certs | bool diff --git a/ansible/roles/cloudkitty/tasks/config_validate.yml b/ansible/roles/cloudkitty/tasks/config_validate.yml index 4806fd83a7..aff2fabea0 100644 --- a/ansible/roles/cloudkitty/tasks/config_validate.yml +++ b/ansible/roles/cloudkitty/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate cloudkitty configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ cloudkitty_services }}" diff --git a/ansible/roles/cloudkitty/tasks/deploy-containers.yml b/ansible/roles/cloudkitty/tasks/deploy-containers.yml index eb24ab5c7a..e02e640bdd 100644 --- a/ansible/roles/cloudkitty/tasks/deploy-containers.yml +++ b/ansible/roles/cloudkitty/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check cloudkitty containers + import_tasks: check-containers.yml diff --git a/ansible/roles/cloudkitty/tasks/deploy.yml b/ansible/roles/cloudkitty/tasks/deploy.yml index 821951b00a..b28fbb5be0 100644 --- a/ansible/roles/cloudkitty/tasks/deploy.yml +++ b/ansible/roles/cloudkitty/tasks/deploy.yml @@ -1,14 +1,19 @@ --- -- import_tasks: register.yml +- name: Register cloudkitty in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure cloudkitty + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check cloudkitty containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone cloudkitty repository + include_tasks: clone.yml when: cloudkitty_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap cloudkitty service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/cloudkitty/tasks/main.yml b/ansible/roles/cloudkitty/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/cloudkitty/tasks/main.yml +++ b/ansible/roles/cloudkitty/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/cloudkitty/tasks/precheck.yml b/ansible/roles/cloudkitty/tasks/precheck.yml index a9c7587588..9a726ea83d 100644 --- a/ansible/roles/cloudkitty/tasks/precheck.yml +++ b/ansible/roles/cloudkitty/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck cloudkitty configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ cloudkitty_services }}" diff --git a/ansible/roles/cloudkitty/tasks/pull.yml b/ansible/roles/cloudkitty/tasks/pull.yml index 53f9c5fda1..fd6d79a209 100644 --- a/ansible/roles/cloudkitty/tasks/pull.yml +++ b/ansible/roles/cloudkitty/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull cloudkitty images + import_role: role: service-images-pull diff --git a/ansible/roles/cloudkitty/tasks/reconfigure.yml b/ansible/roles/cloudkitty/tasks/reconfigure.yml index 5b10a7e111..34908bc1f0 100644 --- a/ansible/roles/cloudkitty/tasks/reconfigure.yml +++ b/ansible/roles/cloudkitty/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy cloudkitty + import_tasks: deploy.yml diff --git a/ansible/roles/cloudkitty/tasks/register.yml b/ansible/roles/cloudkitty/tasks/register.yml index a3c42cd6e1..2e3b16204a 100644 --- a/ansible/roles/cloudkitty/tasks/register.yml +++ b/ansible/roles/cloudkitty/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register cloudkitty service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_cloudkitty_auth }}" diff --git a/ansible/roles/cloudkitty/tasks/stop.yml b/ansible/roles/cloudkitty/tasks/stop.yml index def3d155ab..1ab434872a 100644 --- a/ansible/roles/cloudkitty/tasks/stop.yml +++ b/ansible/roles/cloudkitty/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop cloudkitty containers + import_role: name: service-stop vars: project_services: "{{ cloudkitty_services }}" diff --git a/ansible/roles/cloudkitty/tasks/upgrade.yml b/ansible/roles/cloudkitty/tasks/upgrade.yml index 6ba9f99799..aeae00aed5 100644 --- a/ansible/roles/cloudkitty/tasks/upgrade.yml +++ b/ansible/roles/cloudkitty/tasks/upgrade.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure cloudkitty + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check cloudkitty containers + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Run cloudkitty bootstrap container + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/collectd/tasks/check-containers.yml b/ansible/roles/collectd/tasks/check-containers.yml index b7e2f7c29f..997d367e17 100644 --- a/ansible/roles/collectd/tasks/check-containers.yml +++ b/ansible/roles/collectd/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check collectd containers + import_role: name: service-check-containers diff --git a/ansible/roles/collectd/tasks/deploy-containers.yml b/ansible/roles/collectd/tasks/deploy-containers.yml index eb24ab5c7a..5b472d2cc3 100644 --- a/ansible/roles/collectd/tasks/deploy-containers.yml +++ b/ansible/roles/collectd/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check collectd containers + import_tasks: check-containers.yml diff --git a/ansible/roles/collectd/tasks/deploy.yml b/ansible/roles/collectd/tasks/deploy.yml index 49edff81e3..6de0b6c049 100644 --- a/ansible/roles/collectd/tasks/deploy.yml +++ b/ansible/roles/collectd/tasks/deploy.yml @@ -1,7 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure collectd + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check collectd containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/collectd/tasks/main.yml b/ansible/roles/collectd/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/collectd/tasks/main.yml +++ b/ansible/roles/collectd/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/collectd/tasks/precheck.yml b/ansible/roles/collectd/tasks/precheck.yml index f3b60f8aca..d7be68da8e 100644 --- a/ansible/roles/collectd/tasks/precheck.yml +++ b/ansible/roles/collectd/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck collectd configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ collectd_services }}" diff --git a/ansible/roles/collectd/tasks/pull.yml b/ansible/roles/collectd/tasks/pull.yml index 53f9c5fda1..2335fd348e 100644 --- a/ansible/roles/collectd/tasks/pull.yml +++ b/ansible/roles/collectd/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull collectd images + import_role: role: service-images-pull diff --git a/ansible/roles/collectd/tasks/reconfigure.yml b/ansible/roles/collectd/tasks/reconfigure.yml index 5b10a7e111..69139b87e1 100644 --- a/ansible/roles/collectd/tasks/reconfigure.yml +++ b/ansible/roles/collectd/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy collectd + import_tasks: deploy.yml diff --git a/ansible/roles/collectd/tasks/stop.yml b/ansible/roles/collectd/tasks/stop.yml index 93bdf8952c..cce137ebcd 100644 --- a/ansible/roles/collectd/tasks/stop.yml +++ b/ansible/roles/collectd/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop collectd containers + import_role: name: service-stop vars: project_services: "{{ collectd_services }}" diff --git a/ansible/roles/collectd/tasks/upgrade.yml b/ansible/roles/collectd/tasks/upgrade.yml index 49edff81e3..6de0b6c049 100644 --- a/ansible/roles/collectd/tasks/upgrade.yml +++ b/ansible/roles/collectd/tasks/upgrade.yml @@ -1,7 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure collectd + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check collectd containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/common/tasks/check-containers.yml b/ansible/roles/common/tasks/check-containers.yml index b7e2f7c29f..ce562080f4 100644 --- a/ansible/roles/common/tasks/check-containers.yml +++ b/ansible/roles/common/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check common containers + import_role: name: service-check-containers diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml index 3d8f0bb36b..c27614343d 100644 --- a/ansible/roles/common/tasks/config.yml +++ b/ansible/roles/common/tasks/config.yml @@ -17,7 +17,8 @@ - paths when: service | service_enabled_and_mapped_to_host -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - common_copy_certs | bool diff --git a/ansible/roles/common/tasks/deploy-containers.yml b/ansible/roles/common/tasks/deploy-containers.yml index eb24ab5c7a..47b6a19b09 100644 --- a/ansible/roles/common/tasks/deploy-containers.yml +++ b/ansible/roles/common/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check common containers + import_tasks: check-containers.yml diff --git a/ansible/roles/common/tasks/deploy.yml b/ansible/roles/common/tasks/deploy.yml index d0b36cb78b..9304107f9d 100644 --- a/ansible/roles/common/tasks/deploy.yml +++ b/ansible/roles/common/tasks/deploy.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure common + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check common containers + import_tasks: check-containers.yml -- import_tasks: bootstrap.yml +- name: Bootstrap common service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/common/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/common/tasks/precheck.yml b/ansible/roles/common/tasks/precheck.yml index 9b075bcec7..82d5a1d156 100644 --- a/ansible/roles/common/tasks/precheck.yml +++ b/ansible/roles/common/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck common configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ common_services }}" diff --git a/ansible/roles/common/tasks/pull.yml b/ansible/roles/common/tasks/pull.yml index 53f9c5fda1..8f25f799a3 100644 --- a/ansible/roles/common/tasks/pull.yml +++ b/ansible/roles/common/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull common images + import_role: role: service-images-pull diff --git a/ansible/roles/common/tasks/reconfigure.yml b/ansible/roles/common/tasks/reconfigure.yml index 5b10a7e111..05ca495a94 100644 --- a/ansible/roles/common/tasks/reconfigure.yml +++ b/ansible/roles/common/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy common + import_tasks: deploy.yml diff --git a/ansible/roles/common/tasks/stop.yml b/ansible/roles/common/tasks/stop.yml index 141f3b3f20..d554e5fb41 100644 --- a/ansible/roles/common/tasks/stop.yml +++ b/ansible/roles/common/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop common containers + import_role: name: service-stop vars: project_services: "{{ common_services }}" diff --git a/ansible/roles/common/tasks/upgrade.yml b/ansible/roles/common/tasks/upgrade.yml index 49edff81e3..ab6f5d51b5 100644 --- a/ansible/roles/common/tasks/upgrade.yml +++ b/ansible/roles/common/tasks/upgrade.yml @@ -1,7 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure common + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check common containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/container-engine-migration/tasks/main.yml b/ansible/roles/container-engine-migration/tasks/main.yml index 4fd538fddb..16ca75b1c7 100644 --- a/ansible/roles/container-engine-migration/tasks/main.yml +++ b/ansible/roles/container-engine-migration/tasks/main.yml @@ -1,8 +1,12 @@ --- -- import_tasks: check-migration.yml +- name: Import tasks from check-migration.yml + import_tasks: check-migration.yml -- import_tasks: install-target-engine.yml +- name: Import tasks from install-target-engine.yml + import_tasks: install-target-engine.yml -- import_tasks: migrate-volumes.yml +- name: Import tasks from migrate-volumes.yml + import_tasks: migrate-volumes.yml -- import_tasks: uninstall-current-engine.yml +- name: Import tasks from uninstall-current-engine.yml + import_tasks: uninstall-current-engine.yml diff --git a/ansible/roles/container-engine-migration/tasks/migrate-volumes.yml b/ansible/roles/container-engine-migration/tasks/migrate-volumes.yml index 34fcfacdf4..afbaeaa180 100644 --- a/ansible/roles/container-engine-migration/tasks/migrate-volumes.yml +++ b/ansible/roles/container-engine-migration/tasks/migrate-volumes.yml @@ -6,7 +6,8 @@ container_engine: "{{ current_engine }}" register: containers -- import_tasks: ovs-cleanup.yml +- name: Import tasks from ovs-cleanup.yml + import_tasks: ovs-cleanup.yml when: - "'openvswitch_vswitchd' in containers.container_names" - neutron_plugin_agent == 'openvswitch' @@ -36,7 +37,8 @@ # NOTE(r-krcek): The following block is workaround for problem where podman # changes directory permissions after starting a container from any UID:GID # to root after migration. -- when: container_volumes.matched > 0 +- name: Migrate container volumes to target engine + when: container_volumes.matched > 0 block: - name: Pre-create volumes in target engine become: true diff --git a/ansible/roles/cron/tasks/check-containers.yml b/ansible/roles/cron/tasks/check-containers.yml index b7e2f7c29f..d5ab9d900f 100644 --- a/ansible/roles/cron/tasks/check-containers.yml +++ b/ansible/roles/cron/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check cron containers + import_role: name: service-check-containers diff --git a/ansible/roles/cron/tasks/config.yml b/ansible/roles/cron/tasks/config.yml index caebee58cf..9ea3c92fb9 100644 --- a/ansible/roles/cron/tasks/config.yml +++ b/ansible/roles/cron/tasks/config.yml @@ -12,7 +12,8 @@ become: true when: service | service_enabled_and_mapped_to_host -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - cron_copy_certs | bool diff --git a/ansible/roles/cron/tasks/deploy-containers.yml b/ansible/roles/cron/tasks/deploy-containers.yml index eb24ab5c7a..68f9103a0f 100644 --- a/ansible/roles/cron/tasks/deploy-containers.yml +++ b/ansible/roles/cron/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check cron containers + import_tasks: check-containers.yml diff --git a/ansible/roles/cron/tasks/deploy.yml b/ansible/roles/cron/tasks/deploy.yml index d0b36cb78b..55d991c21a 100644 --- a/ansible/roles/cron/tasks/deploy.yml +++ b/ansible/roles/cron/tasks/deploy.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure cron + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check cron containers + import_tasks: check-containers.yml -- import_tasks: bootstrap.yml +- name: Bootstrap cron service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/cron/tasks/main.yml b/ansible/roles/cron/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/cron/tasks/main.yml +++ b/ansible/roles/cron/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/cron/tasks/precheck.yml b/ansible/roles/cron/tasks/precheck.yml index 9a65561141..8da0ec64e9 100644 --- a/ansible/roles/cron/tasks/precheck.yml +++ b/ansible/roles/cron/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck cron configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ cron_services }}" diff --git a/ansible/roles/cron/tasks/pull.yml b/ansible/roles/cron/tasks/pull.yml index 53f9c5fda1..61cc8e7f8b 100644 --- a/ansible/roles/cron/tasks/pull.yml +++ b/ansible/roles/cron/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull cron images + import_role: role: service-images-pull diff --git a/ansible/roles/cron/tasks/reconfigure.yml b/ansible/roles/cron/tasks/reconfigure.yml index 5b10a7e111..24ff29cf59 100644 --- a/ansible/roles/cron/tasks/reconfigure.yml +++ b/ansible/roles/cron/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy cron + import_tasks: deploy.yml diff --git a/ansible/roles/cron/tasks/stop.yml b/ansible/roles/cron/tasks/stop.yml index ce903cd50f..969ac426d1 100644 --- a/ansible/roles/cron/tasks/stop.yml +++ b/ansible/roles/cron/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop cron containers + import_role: name: service-stop vars: project_services: "{{ cron_services }}" diff --git a/ansible/roles/cron/tasks/upgrade.yml b/ansible/roles/cron/tasks/upgrade.yml index 49edff81e3..058748d2e2 100644 --- a/ansible/roles/cron/tasks/upgrade.yml +++ b/ansible/roles/cron/tasks/upgrade.yml @@ -1,7 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure cron + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check cron containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/cyborg/tasks/bootstrap.yml b/ansible/roles/cyborg/tasks/bootstrap.yml index 348ed40ee7..0c4400b79c 100644 --- a/ansible/roles/cyborg/tasks/bootstrap.yml +++ b/ansible/roles/cyborg/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run cyborg bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/cyborg/tasks/check-containers.yml b/ansible/roles/cyborg/tasks/check-containers.yml index b7e2f7c29f..0a5ddef5a0 100644 --- a/ansible/roles/cyborg/tasks/check-containers.yml +++ b/ansible/roles/cyborg/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check cyborg containers + import_role: name: service-check-containers diff --git a/ansible/roles/cyborg/tasks/config.yml b/ansible/roles/cyborg/tasks/config.yml index ce3a06f094..23de526c5d 100644 --- a/ansible/roles/cyborg/tasks/config.yml +++ b/ansible/roles/cyborg/tasks/config.yml @@ -38,7 +38,8 @@ - cyborg_policy_file is defined with_dict: "{{ cyborg_services | select_services_enabled_and_mapped_to_host }}" -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - cyborg_copy_certs | bool diff --git a/ansible/roles/cyborg/tasks/config_validate.yml b/ansible/roles/cyborg/tasks/config_validate.yml index fd9c072360..722904c2bf 100644 --- a/ansible/roles/cyborg/tasks/config_validate.yml +++ b/ansible/roles/cyborg/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate cyborg configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ cyborg_services }}" diff --git a/ansible/roles/cyborg/tasks/deploy-containers.yml b/ansible/roles/cyborg/tasks/deploy-containers.yml index eb24ab5c7a..3d2e1cdaaa 100644 --- a/ansible/roles/cyborg/tasks/deploy-containers.yml +++ b/ansible/roles/cyborg/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check cyborg containers + import_tasks: check-containers.yml diff --git a/ansible/roles/cyborg/tasks/deploy.yml b/ansible/roles/cyborg/tasks/deploy.yml index c2a293fc1a..13742275e2 100644 --- a/ansible/roles/cyborg/tasks/deploy.yml +++ b/ansible/roles/cyborg/tasks/deploy.yml @@ -1,14 +1,19 @@ --- -- import_tasks: register.yml +- name: Register cyborg in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure cyborg + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check cyborg containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone cyborg repository + include_tasks: clone.yml when: cyborg_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap cyborg service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/cyborg/tasks/main.yml b/ansible/roles/cyborg/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/cyborg/tasks/main.yml +++ b/ansible/roles/cyborg/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/cyborg/tasks/precheck.yml b/ansible/roles/cyborg/tasks/precheck.yml index 68b7eaa04f..c1ae1098a3 100644 --- a/ansible/roles/cyborg/tasks/precheck.yml +++ b/ansible/roles/cyborg/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck cyborg configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ cyborg_services }}" diff --git a/ansible/roles/cyborg/tasks/pull.yml b/ansible/roles/cyborg/tasks/pull.yml index 53f9c5fda1..68d5ddda99 100644 --- a/ansible/roles/cyborg/tasks/pull.yml +++ b/ansible/roles/cyborg/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull cyborg images + import_role: role: service-images-pull diff --git a/ansible/roles/cyborg/tasks/reconfigure.yml b/ansible/roles/cyborg/tasks/reconfigure.yml index 5b10a7e111..4966ca3252 100644 --- a/ansible/roles/cyborg/tasks/reconfigure.yml +++ b/ansible/roles/cyborg/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy cyborg + import_tasks: deploy.yml diff --git a/ansible/roles/cyborg/tasks/register.yml b/ansible/roles/cyborg/tasks/register.yml index 5bd1c954cf..40c55971ed 100644 --- a/ansible/roles/cyborg/tasks/register.yml +++ b/ansible/roles/cyborg/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register cyborg service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_cyborg_auth }}" diff --git a/ansible/roles/cyborg/tasks/stop.yml b/ansible/roles/cyborg/tasks/stop.yml index 2a5eb47972..23a1e96616 100644 --- a/ansible/roles/cyborg/tasks/stop.yml +++ b/ansible/roles/cyborg/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop cyborg containers + import_role: name: service-stop vars: project_services: "{{ cyborg_services }}" diff --git a/ansible/roles/cyborg/tasks/upgrade.yml b/ansible/roles/cyborg/tasks/upgrade.yml index 6ba9f99799..efb3c3c8af 100644 --- a/ansible/roles/cyborg/tasks/upgrade.yml +++ b/ansible/roles/cyborg/tasks/upgrade.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure cyborg + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check cyborg containers + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Run cyborg bootstrap container + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/designate/defaults/main.yml b/ansible/roles/designate/defaults/main.yml index 95bc01a080..838684f68d 100644 --- a/ansible/roles/designate/defaults/main.yml +++ b/ansible/roles/designate/defaults/main.yml @@ -8,6 +8,7 @@ designate_services: volumes: "{{ designate_api_default_volumes + designate_api_extra_volumes }}" dimensions: "{{ designate_api_dimensions }}" healthcheck: "{{ designate_api_healthcheck }}" + wsgi: "designate.wsgi.api:application" haproxy: designate_api: enabled: "{{ enable_designate }}" @@ -17,6 +18,7 @@ designate_services: listen_port: "{{ designate_api_listen_port }}" backend_http_extra: - "option httpchk" + tls_backend: "{{ designate_enable_tls_backend | bool }}" designate_api_external: enabled: "{{ enable_designate }}" mode: "http" @@ -26,6 +28,7 @@ designate_services: listen_port: "{{ designate_api_listen_port }}" backend_http_extra: - "option httpchk" + tls_backend: "{{ designate_enable_tls_backend | bool }}" designate-backend-bind9: container_name: designate_backend_bind9 group: designate-backend-bind9 @@ -151,7 +154,7 @@ designate_api_enable_healthchecks: "{{ enable_container_healthchecks }}" designate_api_healthcheck_interval: "{{ default_container_healthcheck_interval }}" designate_api_healthcheck_retries: "{{ default_container_healthcheck_retries }}" designate_api_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}" -designate_api_healthcheck_test: ["CMD-SHELL", "healthcheck_curl http://{{ api_interface_address | put_address_in_context('url') }}:{{ designate_api_listen_port }}"] +designate_api_healthcheck_test: ["CMD-SHELL", "healthcheck_curl {{ 'https' if designate_enable_tls_backend | bool else 'http' }}://{{ api_interface_address | put_address_in_context('url') }}:{{ designate_api_listen_port }}"] designate_api_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}" designate_api_healthcheck: interval: "{{ designate_api_healthcheck_interval }}" @@ -368,10 +371,17 @@ designate_ks_users: password: "{{ designate_keystone_password }}" role: "admin" +################### # Database +################### designate_database_enable_tls_internal: "{{ database_enable_tls_internal | bool }}" ################### # Copy certificates ################### -designate_copy_certs: "{{ kolla_copy_ca_into_containers | bool or designate_database_enable_tls_internal | bool }}" +designate_copy_certs: "{{ kolla_copy_ca_into_containers | bool or designate_database_enable_tls_internal | bool or designate_enable_tls_backend | bool }}" + +################### +# TLS +################### +designate_enable_tls_backend: "{{ kolla_enable_tls_backend }}" diff --git a/ansible/roles/designate/tasks/bootstrap.yml b/ansible/roles/designate/tasks/bootstrap.yml index 7b2805724c..5507140599 100644 --- a/ansible/roles/designate/tasks/bootstrap.yml +++ b/ansible/roles/designate/tasks/bootstrap.yml @@ -44,4 +44,5 @@ - not use_preconfigured_databases | bool no_log: true -- import_tasks: bootstrap_service.yml +- name: Run designate bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/designate/tasks/check-containers.yml b/ansible/roles/designate/tasks/check-containers.yml index b7e2f7c29f..8cc9f28ea2 100644 --- a/ansible/roles/designate/tasks/check-containers.yml +++ b/ansible/roles/designate/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check designate containers + import_role: name: service-check-containers diff --git a/ansible/roles/designate/tasks/config.yml b/ansible/roles/designate/tasks/config.yml index f921a69d73..a9aafe975b 100644 --- a/ansible/roles/designate/tasks/config.yml +++ b/ansible/roles/designate/tasks/config.yml @@ -28,7 +28,8 @@ when: - designate_policy.results | length > 0 -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - designate_copy_certs | bool @@ -40,6 +41,24 @@ become: true with_dict: "{{ designate_services | select_services_enabled_and_mapped_to_host }}" +- name: Configure uWSGI for Designate + include_role: + name: service-uwsgi-config + vars: + project_services: "{{ designate_services }}" + service: "{{ designate_services['designate-api'] }}" + service_name: "designate-api" + service_uwsgi_config_http_port: "{{ designate_api_listen_port }}" + service_uwsgi_config_log_file_chmod: "644" + service_uwsgi_config_module: "{{ service.wsgi }}" + service_uwsgi_config_tls_backend: "{{ designate_enable_tls_backend | bool }}" + service_uwsgi_config_tls_cert: "/etc/designate/certs/designate-cert.pem" + service_uwsgi_config_tls_key: "/etc/designate/certs/designate-key.pem" + service_uwsgi_config_workers: "{{ designate_api_workers }}" + service_uwsgi_config_uid: "designate" + when: + - service | service_enabled_and_mapped_to_host + - name: Copying over designate.conf vars: service_name: "{{ item.key }}" @@ -107,7 +126,8 @@ - item.key in [ "designate-backend-bind9", "designate-worker" ] with_dict: "{{ designate_services | select_services_enabled_and_mapped_to_host }}" -- include_tasks: backend_external.yml +- name: Include tasks from backend_external.yml + include_tasks: backend_external.yml when: designate_backend_external == 'bind9' - name: Copying over existing policy file diff --git a/ansible/roles/designate/tasks/config_validate.yml b/ansible/roles/designate/tasks/config_validate.yml index febfb66bf7..6d48562cbc 100644 --- a/ansible/roles/designate/tasks/config_validate.yml +++ b/ansible/roles/designate/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate designate configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ designate_services }}" diff --git a/ansible/roles/designate/tasks/deploy-containers.yml b/ansible/roles/designate/tasks/deploy-containers.yml index eb24ab5c7a..81894f38af 100644 --- a/ansible/roles/designate/tasks/deploy-containers.yml +++ b/ansible/roles/designate/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check designate containers + import_tasks: check-containers.yml diff --git a/ansible/roles/designate/tasks/deploy.yml b/ansible/roles/designate/tasks/deploy.yml index b4bd4d3389..2e51bfe012 100644 --- a/ansible/roles/designate/tasks/deploy.yml +++ b/ansible/roles/designate/tasks/deploy.yml @@ -1,16 +1,22 @@ --- -- import_tasks: register.yml +- name: Register designate in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure designate + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check designate containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone designate repository + include_tasks: clone.yml when: designate_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap designate service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers -- import_tasks: update_pools.yml +- name: Import tasks from update_pools.yml + import_tasks: update_pools.yml diff --git a/ansible/roles/designate/tasks/main.yml b/ansible/roles/designate/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/designate/tasks/main.yml +++ b/ansible/roles/designate/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/designate/tasks/precheck.yml b/ansible/roles/designate/tasks/precheck.yml index 0943afd6dd..69d0319473 100644 --- a/ansible/roles/designate/tasks/precheck.yml +++ b/ansible/roles/designate/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck designate configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ designate_services }}" diff --git a/ansible/roles/designate/tasks/pull.yml b/ansible/roles/designate/tasks/pull.yml index 53f9c5fda1..1423aa8f71 100644 --- a/ansible/roles/designate/tasks/pull.yml +++ b/ansible/roles/designate/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull designate images + import_role: role: service-images-pull diff --git a/ansible/roles/designate/tasks/reconfigure.yml b/ansible/roles/designate/tasks/reconfigure.yml index 5b10a7e111..128d3afb35 100644 --- a/ansible/roles/designate/tasks/reconfigure.yml +++ b/ansible/roles/designate/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy designate + import_tasks: deploy.yml diff --git a/ansible/roles/designate/tasks/register.yml b/ansible/roles/designate/tasks/register.yml index 6bb2863c81..98d5bbf98a 100644 --- a/ansible/roles/designate/tasks/register.yml +++ b/ansible/roles/designate/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register designate service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_designate_auth }}" diff --git a/ansible/roles/designate/tasks/stop.yml b/ansible/roles/designate/tasks/stop.yml index a7b44c9c34..0ef476cda2 100644 --- a/ansible/roles/designate/tasks/stop.yml +++ b/ansible/roles/designate/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop designate containers + import_role: name: service-stop vars: project_services: "{{ designate_services }}" diff --git a/ansible/roles/designate/tasks/upgrade.yml b/ansible/roles/designate/tasks/upgrade.yml index b87dcfb5c3..077810f842 100644 --- a/ansible/roles/designate/tasks/upgrade.yml +++ b/ansible/roles/designate/tasks/upgrade.yml @@ -1,11 +1,15 @@ --- -- import_tasks: config.yml +- name: Configure designate + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check designate containers + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Run designate bootstrap container + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers -- import_tasks: update_pools.yml +- name: Import tasks from update_pools.yml + import_tasks: update_pools.yml diff --git a/ansible/roles/designate/templates/designate-api.json.j2 b/ansible/roles/designate/templates/designate-api.json.j2 index b07b41daed..a7a45a509c 100644 --- a/ansible/roles/designate/templates/designate-api.json.j2 +++ b/ansible/roles/designate/templates/designate-api.json.j2 @@ -1,12 +1,30 @@ { - "command": "designate-api --config-file /etc/designate/designate.conf", + "command": "uwsgi /etc/designate/designate-api-uwsgi.ini", "config_files": [ { "source": "{{ container_config_directory }}/designate.conf", "dest": "/etc/designate/designate.conf", "owner": "designate", "perm": "0600" - }{% if designate_policy_file is defined %}, + }, + { + "source": "{{ container_config_directory }}/designate-api-uwsgi.ini", + "dest": "/etc/designate/designate-api-uwsgi.ini", + "owner": "designate", + "perm": "0600" + }{% if designate_enable_tls_backend | bool %}, + { + "source": "{{ container_config_directory }}/designate-cert.pem", + "dest": "/etc/designate/certs/designate-cert.pem", + "owner": "designate", + "perm": "0600" + }, + { + "source": "{{ container_config_directory }}/designate-key.pem", + "dest": "/etc/designate/certs/designate-key.pem", + "owner": "designate", + "perm": "0600" + }{% endif %}{% if designate_policy_file is defined %}, { "source": "{{ container_config_directory }}/{{ designate_policy_file }}", "dest": "/etc/designate/{{ designate_policy_file }}", diff --git a/ansible/roles/designate/templates/designate.conf.j2 b/ansible/roles/designate/templates/designate.conf.j2 index 2ec55f8270..f68c0b2e9b 100644 --- a/ansible/roles/designate/templates/designate.conf.j2 +++ b/ansible/roles/designate/templates/designate.conf.j2 @@ -3,6 +3,9 @@ debug = {{ designate_logging_debug }} log_dir = /var/log/kolla/designate +{% if service_name == 'designate-api' %} +log_file = /var/log/kolla/designate/{{ service_name }}.log +{% endif %} transport_url = {{ rpc_transport_url }} diff --git a/ansible/roles/destroy/tasks/cleanup_host.yml b/ansible/roles/destroy/tasks/cleanup_host.yml index 6d227f7618..4a983956c9 100644 --- a/ansible/roles/destroy/tasks/cleanup_host.yml +++ b/ansible/roles/destroy/tasks/cleanup_host.yml @@ -15,7 +15,8 @@ destroy_include_dev: "{{ destroy_include_dev }}" kolla_ansible_inventories: "{{ ansible_inventory_sources | join(' ') }}" -- when: +- name: Clean up Octavia interface service + when: - enable_octavia | bool - octavia_auto_configure | bool - octavia_network_type == 'tenant' diff --git a/ansible/roles/destroy/tasks/main.yml b/ansible/roles/destroy/tasks/main.yml index f32bc9919a..a63902a85a 100644 --- a/ansible/roles/destroy/tasks/main.yml +++ b/ansible/roles/destroy/tasks/main.yml @@ -1,8 +1,12 @@ --- -- include_tasks: validate_docker_execute.yml +- name: Include tasks from validate_docker_execute.yml + include_tasks: validate_docker_execute.yml -- include_tasks: cleanup_containers.yml +- name: Include tasks from cleanup_containers.yml + include_tasks: cleanup_containers.yml -- include_tasks: cleanup_images.yml +- name: Include tasks from cleanup_images.yml + include_tasks: cleanup_images.yml -- include_tasks: cleanup_host.yml +- name: Include tasks from cleanup_host.yml + include_tasks: cleanup_host.yml diff --git a/ansible/roles/etcd/tasks/bootstrap.yml b/ansible/roles/etcd/tasks/bootstrap.yml index eb0d00a20d..c0fe25ab70 100644 --- a/ansible/roles/etcd/tasks/bootstrap.yml +++ b/ansible/roles/etcd/tasks/bootstrap.yml @@ -1,5 +1,6 @@ --- -- import_tasks: lookup_cluster.yml +- name: Import tasks from lookup_cluster.yml + import_tasks: lookup_cluster.yml # NOTE(jan.gutter): The following two tasks set facts that aren't really used. # They serve the purpose to trigger the handlers for bootstrapping: diff --git a/ansible/roles/etcd/tasks/check-containers.yml b/ansible/roles/etcd/tasks/check-containers.yml index b7e2f7c29f..058969fa79 100644 --- a/ansible/roles/etcd/tasks/check-containers.yml +++ b/ansible/roles/etcd/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check etcd containers + import_role: name: service-check-containers diff --git a/ansible/roles/etcd/tasks/config.yml b/ansible/roles/etcd/tasks/config.yml index c27fa496a6..2d6efbf37d 100644 --- a/ansible/roles/etcd/tasks/config.yml +++ b/ansible/roles/etcd/tasks/config.yml @@ -17,6 +17,7 @@ become: true with_dict: "{{ etcd_services | select_services_enabled_and_mapped_to_host }}" -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - etcd_copy_certs | bool diff --git a/ansible/roles/etcd/tasks/deploy-containers.yml b/ansible/roles/etcd/tasks/deploy-containers.yml index eb24ab5c7a..fb5c7a780b 100644 --- a/ansible/roles/etcd/tasks/deploy-containers.yml +++ b/ansible/roles/etcd/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check etcd containers + import_tasks: check-containers.yml diff --git a/ansible/roles/etcd/tasks/deploy.yml b/ansible/roles/etcd/tasks/deploy.yml index d0b36cb78b..e1455f68cb 100644 --- a/ansible/roles/etcd/tasks/deploy.yml +++ b/ansible/roles/etcd/tasks/deploy.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure etcd + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check etcd containers + import_tasks: check-containers.yml -- import_tasks: bootstrap.yml +- name: Bootstrap etcd service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/etcd/tasks/main.yml b/ansible/roles/etcd/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/etcd/tasks/main.yml +++ b/ansible/roles/etcd/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/etcd/tasks/precheck.yml b/ansible/roles/etcd/tasks/precheck.yml index e2cc9d2f88..5c02f47a71 100644 --- a/ansible/roles/etcd/tasks/precheck.yml +++ b/ansible/roles/etcd/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck etcd configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ etcd_services }}" diff --git a/ansible/roles/etcd/tasks/pull.yml b/ansible/roles/etcd/tasks/pull.yml index 53f9c5fda1..cd1f70475f 100644 --- a/ansible/roles/etcd/tasks/pull.yml +++ b/ansible/roles/etcd/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull etcd images + import_role: role: service-images-pull diff --git a/ansible/roles/etcd/tasks/reconfigure.yml b/ansible/roles/etcd/tasks/reconfigure.yml index 5b10a7e111..f5f86bca90 100644 --- a/ansible/roles/etcd/tasks/reconfigure.yml +++ b/ansible/roles/etcd/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy etcd + import_tasks: deploy.yml diff --git a/ansible/roles/etcd/tasks/stop.yml b/ansible/roles/etcd/tasks/stop.yml index 45cf86b47f..6925508e42 100644 --- a/ansible/roles/etcd/tasks/stop.yml +++ b/ansible/roles/etcd/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop etcd containers + import_role: name: service-stop vars: project_services: "{{ etcd_services }}" diff --git a/ansible/roles/etcd/tasks/upgrade.yml b/ansible/roles/etcd/tasks/upgrade.yml index 49edff81e3..247ce55e89 100644 --- a/ansible/roles/etcd/tasks/upgrade.yml +++ b/ansible/roles/etcd/tasks/upgrade.yml @@ -1,7 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure etcd + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check etcd containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/fluentd/tasks/check-containers.yml b/ansible/roles/fluentd/tasks/check-containers.yml index b7e2f7c29f..e567793360 100644 --- a/ansible/roles/fluentd/tasks/check-containers.yml +++ b/ansible/roles/fluentd/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check fluentd containers + import_role: name: service-check-containers diff --git a/ansible/roles/fluentd/tasks/config.yml b/ansible/roles/fluentd/tasks/config.yml index 1f33b4852a..3a4115a35c 100644 --- a/ansible/roles/fluentd/tasks/config.yml +++ b/ansible/roles/fluentd/tasks/config.yml @@ -12,7 +12,8 @@ become: true when: service | service_enabled_and_mapped_to_host -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - kolla_copy_ca_into_containers | bool diff --git a/ansible/roles/fluentd/tasks/deploy-containers.yml b/ansible/roles/fluentd/tasks/deploy-containers.yml index eb24ab5c7a..37ee856abc 100644 --- a/ansible/roles/fluentd/tasks/deploy-containers.yml +++ b/ansible/roles/fluentd/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check fluentd containers + import_tasks: check-containers.yml diff --git a/ansible/roles/fluentd/tasks/deploy.yml b/ansible/roles/fluentd/tasks/deploy.yml index d0b36cb78b..b12d9b19e8 100644 --- a/ansible/roles/fluentd/tasks/deploy.yml +++ b/ansible/roles/fluentd/tasks/deploy.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure fluentd + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check fluentd containers + import_tasks: check-containers.yml -- import_tasks: bootstrap.yml +- name: Bootstrap fluentd service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/fluentd/tasks/main.yml b/ansible/roles/fluentd/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/fluentd/tasks/main.yml +++ b/ansible/roles/fluentd/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/fluentd/tasks/precheck.yml b/ansible/roles/fluentd/tasks/precheck.yml index d855b3d495..3776cfed5e 100644 --- a/ansible/roles/fluentd/tasks/precheck.yml +++ b/ansible/roles/fluentd/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck fluentd configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ fluentd_services }}" diff --git a/ansible/roles/fluentd/tasks/pull.yml b/ansible/roles/fluentd/tasks/pull.yml index 53f9c5fda1..e3f9f5a97b 100644 --- a/ansible/roles/fluentd/tasks/pull.yml +++ b/ansible/roles/fluentd/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull fluentd images + import_role: role: service-images-pull diff --git a/ansible/roles/fluentd/tasks/reconfigure.yml b/ansible/roles/fluentd/tasks/reconfigure.yml index 5b10a7e111..6ae01e0b02 100644 --- a/ansible/roles/fluentd/tasks/reconfigure.yml +++ b/ansible/roles/fluentd/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy fluentd + import_tasks: deploy.yml diff --git a/ansible/roles/fluentd/tasks/stop.yml b/ansible/roles/fluentd/tasks/stop.yml index 35b052b7c7..788546bc90 100644 --- a/ansible/roles/fluentd/tasks/stop.yml +++ b/ansible/roles/fluentd/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop fluentd containers + import_role: name: service-stop vars: project_services: "{{ fluentd_services }}" diff --git a/ansible/roles/fluentd/tasks/upgrade.yml b/ansible/roles/fluentd/tasks/upgrade.yml index 49edff81e3..1de3f9c991 100644 --- a/ansible/roles/fluentd/tasks/upgrade.yml +++ b/ansible/roles/fluentd/tasks/upgrade.yml @@ -1,7 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure fluentd + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check fluentd containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/glance/tasks/bootstrap.yml b/ansible/roles/glance/tasks/bootstrap.yml index e183e51536..40301f5315 100644 --- a/ansible/roles/glance/tasks/bootstrap.yml +++ b/ansible/roles/glance/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run glance bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/glance/tasks/check-containers.yml b/ansible/roles/glance/tasks/check-containers.yml index b7e2f7c29f..34bbda71ea 100644 --- a/ansible/roles/glance/tasks/check-containers.yml +++ b/ansible/roles/glance/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check glance containers + import_role: name: service-check-containers diff --git a/ansible/roles/glance/tasks/config.yml b/ansible/roles/glance/tasks/config.yml index 6a72a1a298..fc328a6de7 100644 --- a/ansible/roles/glance/tasks/config.yml +++ b/ansible/roles/glance/tasks/config.yml @@ -9,7 +9,8 @@ become: true with_dict: "{{ glance_services | select_services_enabled_and_mapped_to_host }}" -- include_tasks: external_ceph.yml +- name: Include tasks from external_ceph.yml + include_tasks: external_ceph.yml when: - glance_backend_ceph | bool @@ -32,7 +33,8 @@ when: - glance_policy.results | length > 0 -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - glance_copy_certs | bool diff --git a/ansible/roles/glance/tasks/config_validate.yml b/ansible/roles/glance/tasks/config_validate.yml index f4f0a66381..44571bd968 100644 --- a/ansible/roles/glance/tasks/config_validate.yml +++ b/ansible/roles/glance/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate glance configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ glance_services }}" diff --git a/ansible/roles/glance/tasks/deploy-containers.yml b/ansible/roles/glance/tasks/deploy-containers.yml index eb24ab5c7a..865740ed61 100644 --- a/ansible/roles/glance/tasks/deploy-containers.yml +++ b/ansible/roles/glance/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check glance containers + import_tasks: check-containers.yml diff --git a/ansible/roles/glance/tasks/deploy.yml b/ansible/roles/glance/tasks/deploy.yml index c97f065115..53df550b79 100644 --- a/ansible/roles/glance/tasks/deploy.yml +++ b/ansible/roles/glance/tasks/deploy.yml @@ -1,15 +1,20 @@ --- -- import_tasks: register.yml +- name: Register glance in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure glance + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check glance containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone glance repository + include_tasks: clone.yml when: - glance_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap glance service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/glance/tasks/legacy_upgrade.yml b/ansible/roles/glance/tasks/legacy_upgrade.yml index 6ba9f99799..d881e01283 100644 --- a/ansible/roles/glance/tasks/legacy_upgrade.yml +++ b/ansible/roles/glance/tasks/legacy_upgrade.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Import tasks from config.yml + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Import tasks from check-containers.yml + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Import tasks from bootstrap_service.yml + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/glance/tasks/main.yml b/ansible/roles/glance/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/glance/tasks/main.yml +++ b/ansible/roles/glance/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/glance/tasks/precheck.yml b/ansible/roles/glance/tasks/precheck.yml index 7e0e4adfa5..f52191a100 100644 --- a/ansible/roles/glance/tasks/precheck.yml +++ b/ansible/roles/glance/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck glance configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ glance_services }}" diff --git a/ansible/roles/glance/tasks/pull.yml b/ansible/roles/glance/tasks/pull.yml index 53f9c5fda1..12bd4aa26d 100644 --- a/ansible/roles/glance/tasks/pull.yml +++ b/ansible/roles/glance/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull glance images + import_role: role: service-images-pull diff --git a/ansible/roles/glance/tasks/reconfigure.yml b/ansible/roles/glance/tasks/reconfigure.yml index 5b10a7e111..73ec196c18 100644 --- a/ansible/roles/glance/tasks/reconfigure.yml +++ b/ansible/roles/glance/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy glance + import_tasks: deploy.yml diff --git a/ansible/roles/glance/tasks/register.yml b/ansible/roles/glance/tasks/register.yml index 49a6aacfcf..7962750adf 100644 --- a/ansible/roles/glance/tasks/register.yml +++ b/ansible/roles/glance/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register glance service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_glance_auth }}" diff --git a/ansible/roles/glance/tasks/rolling_upgrade.yml b/ansible/roles/glance/tasks/rolling_upgrade.yml index fad51377fa..d148e0eeb3 100644 --- a/ansible/roles/glance/tasks/rolling_upgrade.yml +++ b/ansible/roles/glance/tasks/rolling_upgrade.yml @@ -4,10 +4,12 @@ glance_upgrading: true # Upgrade first node (NEW NODE in the Glance documentation) -- include_tasks: config.yml +- name: Include tasks from config.yml + include_tasks: config.yml when: inventory_hostname == glance_api_hosts[0] -- include_tasks: stop_service.yml +- name: Include tasks from stop_service.yml + include_tasks: stop_service.yml when: inventory_hostname == glance_api_hosts[0] - name: Enable log_bin_trust_function_creators function @@ -73,10 +75,12 @@ - Restart glance-api container # Upgrade remaining node -- include_tasks: config.yml +- name: Include tasks from config.yml + include_tasks: config.yml when: inventory_hostname != glance_api_hosts[0] -- import_tasks: check-containers.yml +- name: Import tasks from check-containers.yml + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/glance/tasks/stop.yml b/ansible/roles/glance/tasks/stop.yml index ed8f3197f3..0535ed9175 100644 --- a/ansible/roles/glance/tasks/stop.yml +++ b/ansible/roles/glance/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop glance containers + import_role: name: service-stop vars: project_services: "{{ glance_services }}" diff --git a/ansible/roles/glance/tasks/upgrade.yml b/ansible/roles/glance/tasks/upgrade.yml index 94f2eff68d..c6b13ddb24 100644 --- a/ansible/roles/glance/tasks/upgrade.yml +++ b/ansible/roles/glance/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- -- include_tasks: rolling_upgrade.yml +- name: Include tasks from rolling_upgrade.yml + include_tasks: rolling_upgrade.yml when: glance_enable_rolling_upgrade | bool -- include_tasks: legacy_upgrade.yml +- name: Include tasks from legacy_upgrade.yml + include_tasks: legacy_upgrade.yml when: not glance_enable_rolling_upgrade | bool diff --git a/ansible/roles/gnocchi/tasks/bootstrap.yml b/ansible/roles/gnocchi/tasks/bootstrap.yml index 088728cdfc..14f8b06513 100644 --- a/ansible/roles/gnocchi/tasks/bootstrap.yml +++ b/ansible/roles/gnocchi/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run gnocchi bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/gnocchi/tasks/check-containers.yml b/ansible/roles/gnocchi/tasks/check-containers.yml index b7e2f7c29f..14c918ba82 100644 --- a/ansible/roles/gnocchi/tasks/check-containers.yml +++ b/ansible/roles/gnocchi/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check gnocchi containers + import_role: name: service-check-containers diff --git a/ansible/roles/gnocchi/tasks/config.yml b/ansible/roles/gnocchi/tasks/config.yml index 7d5868a48e..8897703d30 100644 --- a/ansible/roles/gnocchi/tasks/config.yml +++ b/ansible/roles/gnocchi/tasks/config.yml @@ -9,7 +9,8 @@ become: true with_dict: "{{ gnocchi_services | select_services_enabled_and_mapped_to_host }}" -- include_tasks: external_ceph.yml +- name: Include tasks from external_ceph.yml + include_tasks: external_ceph.yml when: - gnocchi_backend_storage == 'ceph' @@ -32,7 +33,8 @@ when: - gnocchi_policy.results | length > 0 -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - gnocchi_copy_certs | bool diff --git a/ansible/roles/gnocchi/tasks/config_validate.yml b/ansible/roles/gnocchi/tasks/config_validate.yml index a8fa5f57ee..14119fdf4b 100644 --- a/ansible/roles/gnocchi/tasks/config_validate.yml +++ b/ansible/roles/gnocchi/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate gnocchi configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ gnocchi_services }}" diff --git a/ansible/roles/gnocchi/tasks/deploy-containers.yml b/ansible/roles/gnocchi/tasks/deploy-containers.yml index eb24ab5c7a..c475c2c3d5 100644 --- a/ansible/roles/gnocchi/tasks/deploy-containers.yml +++ b/ansible/roles/gnocchi/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check gnocchi containers + import_tasks: check-containers.yml diff --git a/ansible/roles/gnocchi/tasks/deploy.yml b/ansible/roles/gnocchi/tasks/deploy.yml index d793a349da..8ef17472a3 100644 --- a/ansible/roles/gnocchi/tasks/deploy.yml +++ b/ansible/roles/gnocchi/tasks/deploy.yml @@ -1,11 +1,15 @@ --- -- import_tasks: register.yml +- name: Register gnocchi in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure gnocchi + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check gnocchi containers + import_tasks: check-containers.yml -- import_tasks: bootstrap.yml +- name: Bootstrap gnocchi service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/gnocchi/tasks/main.yml b/ansible/roles/gnocchi/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/gnocchi/tasks/main.yml +++ b/ansible/roles/gnocchi/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/gnocchi/tasks/precheck.yml b/ansible/roles/gnocchi/tasks/precheck.yml index 0e797cf918..8168cc090e 100644 --- a/ansible/roles/gnocchi/tasks/precheck.yml +++ b/ansible/roles/gnocchi/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck gnocchi configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ gnocchi_services }}" diff --git a/ansible/roles/gnocchi/tasks/pull.yml b/ansible/roles/gnocchi/tasks/pull.yml index 53f9c5fda1..57ba3c5d09 100644 --- a/ansible/roles/gnocchi/tasks/pull.yml +++ b/ansible/roles/gnocchi/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull gnocchi images + import_role: role: service-images-pull diff --git a/ansible/roles/gnocchi/tasks/reconfigure.yml b/ansible/roles/gnocchi/tasks/reconfigure.yml index 5b10a7e111..de47954e9a 100644 --- a/ansible/roles/gnocchi/tasks/reconfigure.yml +++ b/ansible/roles/gnocchi/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy gnocchi + import_tasks: deploy.yml diff --git a/ansible/roles/gnocchi/tasks/register.yml b/ansible/roles/gnocchi/tasks/register.yml index 7fd7534ef7..2de3c0c629 100644 --- a/ansible/roles/gnocchi/tasks/register.yml +++ b/ansible/roles/gnocchi/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register gnocchi service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_gnocchi_auth }}" diff --git a/ansible/roles/gnocchi/tasks/stop.yml b/ansible/roles/gnocchi/tasks/stop.yml index 1469409b36..c0bf0a8a79 100644 --- a/ansible/roles/gnocchi/tasks/stop.yml +++ b/ansible/roles/gnocchi/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop gnocchi containers + import_role: name: service-stop vars: project_services: "{{ gnocchi_services }}" diff --git a/ansible/roles/gnocchi/tasks/upgrade.yml b/ansible/roles/gnocchi/tasks/upgrade.yml index 6ba9f99799..7d9d61dfd8 100644 --- a/ansible/roles/gnocchi/tasks/upgrade.yml +++ b/ansible/roles/gnocchi/tasks/upgrade.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure gnocchi + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check gnocchi containers + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Run gnocchi bootstrap container + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/grafana/tasks/check-containers.yml b/ansible/roles/grafana/tasks/check-containers.yml index b7e2f7c29f..482a4ccb13 100644 --- a/ansible/roles/grafana/tasks/check-containers.yml +++ b/ansible/roles/grafana/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check grafana containers + import_role: name: service-check-containers diff --git a/ansible/roles/grafana/tasks/config.yml b/ansible/roles/grafana/tasks/config.yml index 0c7cfecd11..9a5ee7dbe2 100644 --- a/ansible/roles/grafana/tasks/config.yml +++ b/ansible/roles/grafana/tasks/config.yml @@ -20,7 +20,8 @@ run_once: true register: check_extra_conf_grafana -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - grafana_copy_certs | bool diff --git a/ansible/roles/grafana/tasks/deploy-containers.yml b/ansible/roles/grafana/tasks/deploy-containers.yml index eb24ab5c7a..fc5bcdb75b 100644 --- a/ansible/roles/grafana/tasks/deploy-containers.yml +++ b/ansible/roles/grafana/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check grafana containers + import_tasks: check-containers.yml diff --git a/ansible/roles/grafana/tasks/deploy.yml b/ansible/roles/grafana/tasks/deploy.yml index 32431aa455..eb5a459b14 100644 --- a/ansible/roles/grafana/tasks/deploy.yml +++ b/ansible/roles/grafana/tasks/deploy.yml @@ -1,11 +1,15 @@ --- -- import_tasks: config.yml +- name: Configure grafana + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check grafana containers + import_tasks: check-containers.yml -- import_tasks: bootstrap.yml +- name: Bootstrap grafana service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers -- import_tasks: post_config.yml +- name: Import tasks from post_config.yml + import_tasks: post_config.yml diff --git a/ansible/roles/grafana/tasks/main.yml b/ansible/roles/grafana/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/grafana/tasks/main.yml +++ b/ansible/roles/grafana/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/grafana/tasks/precheck.yml b/ansible/roles/grafana/tasks/precheck.yml index c2ee768472..1ffd7aa0bc 100644 --- a/ansible/roles/grafana/tasks/precheck.yml +++ b/ansible/roles/grafana/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck grafana configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ grafana_services }}" diff --git a/ansible/roles/grafana/tasks/pull.yml b/ansible/roles/grafana/tasks/pull.yml index 53f9c5fda1..7f7ec16869 100644 --- a/ansible/roles/grafana/tasks/pull.yml +++ b/ansible/roles/grafana/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull grafana images + import_role: role: service-images-pull diff --git a/ansible/roles/grafana/tasks/reconfigure.yml b/ansible/roles/grafana/tasks/reconfigure.yml index 5b10a7e111..1c5fd9032f 100644 --- a/ansible/roles/grafana/tasks/reconfigure.yml +++ b/ansible/roles/grafana/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy grafana + import_tasks: deploy.yml diff --git a/ansible/roles/grafana/tasks/stop.yml b/ansible/roles/grafana/tasks/stop.yml index 82ba9c8e5e..75902fb736 100644 --- a/ansible/roles/grafana/tasks/stop.yml +++ b/ansible/roles/grafana/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop grafana containers + import_role: name: service-stop vars: project_services: "{{ grafana_services }}" diff --git a/ansible/roles/grafana/tasks/upgrade.yml b/ansible/roles/grafana/tasks/upgrade.yml index 88e2196ddb..872e7e3a45 100644 --- a/ansible/roles/grafana/tasks/upgrade.yml +++ b/ansible/roles/grafana/tasks/upgrade.yml @@ -12,9 +12,11 @@ when: inventory_hostname in groups['grafana'] register: grafana_differs -- import_tasks: config.yml +- name: Configure grafana + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check grafana containers + import_tasks: check-containers.yml # NOTE(dszumski): We don't want old Grafana instances running after # a new instance has updated the DB schema. Since the first instance diff --git a/ansible/roles/hacluster/tasks/check-containers.yml b/ansible/roles/hacluster/tasks/check-containers.yml index b7e2f7c29f..fe9640c3b3 100644 --- a/ansible/roles/hacluster/tasks/check-containers.yml +++ b/ansible/roles/hacluster/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check hacluster containers + import_role: name: service-check-containers diff --git a/ansible/roles/hacluster/tasks/deploy-containers.yml b/ansible/roles/hacluster/tasks/deploy-containers.yml index eb24ab5c7a..4597b2b1d9 100644 --- a/ansible/roles/hacluster/tasks/deploy-containers.yml +++ b/ansible/roles/hacluster/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check hacluster containers + import_tasks: check-containers.yml diff --git a/ansible/roles/hacluster/tasks/deploy.yml b/ansible/roles/hacluster/tasks/deploy.yml index 94ecdc51a6..e9395069a3 100644 --- a/ansible/roles/hacluster/tasks/deploy.yml +++ b/ansible/roles/hacluster/tasks/deploy.yml @@ -1,11 +1,15 @@ --- -- import_tasks: bootstrap.yml +- name: Bootstrap hacluster service + import_tasks: bootstrap.yml -- import_tasks: config.yml +- name: Configure hacluster + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check hacluster containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers -- import_tasks: bootstrap_service.yml +- name: Import tasks from bootstrap_service.yml + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/hacluster/tasks/main.yml b/ansible/roles/hacluster/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/hacluster/tasks/main.yml +++ b/ansible/roles/hacluster/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/hacluster/tasks/pull.yml b/ansible/roles/hacluster/tasks/pull.yml index 53f9c5fda1..87074afcf8 100644 --- a/ansible/roles/hacluster/tasks/pull.yml +++ b/ansible/roles/hacluster/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull hacluster images + import_role: role: service-images-pull diff --git a/ansible/roles/hacluster/tasks/reconfigure.yml b/ansible/roles/hacluster/tasks/reconfigure.yml index 5b10a7e111..332b5d43f7 100644 --- a/ansible/roles/hacluster/tasks/reconfigure.yml +++ b/ansible/roles/hacluster/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy hacluster + import_tasks: deploy.yml diff --git a/ansible/roles/hacluster/tasks/stop.yml b/ansible/roles/hacluster/tasks/stop.yml index 22681ad179..6d6741e5af 100644 --- a/ansible/roles/hacluster/tasks/stop.yml +++ b/ansible/roles/hacluster/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop hacluster services + import_role: role: service-stop vars: project_services: "{{ hacluster_services }}" diff --git a/ansible/roles/hacluster/tasks/upgrade.yml b/ansible/roles/hacluster/tasks/upgrade.yml index 5b10a7e111..bdcead398a 100644 --- a/ansible/roles/hacluster/tasks/upgrade.yml +++ b/ansible/roles/hacluster/tasks/upgrade.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Import tasks from deploy.yml + import_tasks: deploy.yml diff --git a/ansible/roles/heat/tasks/bootstrap.yml b/ansible/roles/heat/tasks/bootstrap.yml index 556472e5d9..e4f24202b3 100644 --- a/ansible/roles/heat/tasks/bootstrap.yml +++ b/ansible/roles/heat/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run heat bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/heat/tasks/check-containers.yml b/ansible/roles/heat/tasks/check-containers.yml index b7e2f7c29f..3299586877 100644 --- a/ansible/roles/heat/tasks/check-containers.yml +++ b/ansible/roles/heat/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check heat containers + import_role: name: service-check-containers diff --git a/ansible/roles/heat/tasks/config.yml b/ansible/roles/heat/tasks/config.yml index 2d306f3fab..be6ad57da9 100644 --- a/ansible/roles/heat/tasks/config.yml +++ b/ansible/roles/heat/tasks/config.yml @@ -28,7 +28,8 @@ when: - heat_policy.results | length > 0 -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - heat_copy_certs | bool diff --git a/ansible/roles/heat/tasks/config_validate.yml b/ansible/roles/heat/tasks/config_validate.yml index e1931df598..26e7faa026 100644 --- a/ansible/roles/heat/tasks/config_validate.yml +++ b/ansible/roles/heat/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate heat configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ heat_services }}" diff --git a/ansible/roles/heat/tasks/deploy-containers.yml b/ansible/roles/heat/tasks/deploy-containers.yml index eb24ab5c7a..1626f5b479 100644 --- a/ansible/roles/heat/tasks/deploy-containers.yml +++ b/ansible/roles/heat/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check heat containers + import_tasks: check-containers.yml diff --git a/ansible/roles/heat/tasks/deploy.yml b/ansible/roles/heat/tasks/deploy.yml index 9f2a8d8c21..cc480e6803 100644 --- a/ansible/roles/heat/tasks/deploy.yml +++ b/ansible/roles/heat/tasks/deploy.yml @@ -1,15 +1,20 @@ --- -- import_tasks: register.yml +- name: Register heat in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure heat + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check heat containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone heat repository + include_tasks: clone.yml when: - heat_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap heat service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/heat/tasks/main.yml b/ansible/roles/heat/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/heat/tasks/main.yml +++ b/ansible/roles/heat/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/heat/tasks/precheck.yml b/ansible/roles/heat/tasks/precheck.yml index 0d490d1989..f8835df7f5 100644 --- a/ansible/roles/heat/tasks/precheck.yml +++ b/ansible/roles/heat/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck heat configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ heat_services }}" diff --git a/ansible/roles/heat/tasks/pull.yml b/ansible/roles/heat/tasks/pull.yml index 53f9c5fda1..748dd203be 100644 --- a/ansible/roles/heat/tasks/pull.yml +++ b/ansible/roles/heat/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull heat images + import_role: role: service-images-pull diff --git a/ansible/roles/heat/tasks/reconfigure.yml b/ansible/roles/heat/tasks/reconfigure.yml index 5b10a7e111..ed3792c6c0 100644 --- a/ansible/roles/heat/tasks/reconfigure.yml +++ b/ansible/roles/heat/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy heat + import_tasks: deploy.yml diff --git a/ansible/roles/heat/tasks/register.yml b/ansible/roles/heat/tasks/register.yml index 3482e4d7ca..f82cad14e9 100644 --- a/ansible/roles/heat/tasks/register.yml +++ b/ansible/roles/heat/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register heat service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_heat_auth }}" diff --git a/ansible/roles/heat/tasks/stop.yml b/ansible/roles/heat/tasks/stop.yml index 99584bf2dd..1630ec554c 100644 --- a/ansible/roles/heat/tasks/stop.yml +++ b/ansible/roles/heat/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop heat containers + import_role: name: service-stop vars: project_services: "{{ heat_services }}" diff --git a/ansible/roles/heat/tasks/upgrade.yml b/ansible/roles/heat/tasks/upgrade.yml index 6ba9f99799..d10c4968c4 100644 --- a/ansible/roles/heat/tasks/upgrade.yml +++ b/ansible/roles/heat/tasks/upgrade.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure heat + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check heat containers + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Run heat bootstrap container + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/horizon/tasks/bootstrap.yml b/ansible/roles/horizon/tasks/bootstrap.yml index 431a500643..84147bdf65 100644 --- a/ansible/roles/horizon/tasks/bootstrap.yml +++ b/ansible/roles/horizon/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run horizon bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/horizon/tasks/check-containers.yml b/ansible/roles/horizon/tasks/check-containers.yml index b7e2f7c29f..0b2f2dfb20 100644 --- a/ansible/roles/horizon/tasks/check-containers.yml +++ b/ansible/roles/horizon/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check horizon containers + import_role: name: service-check-containers diff --git a/ansible/roles/horizon/tasks/config.yml b/ansible/roles/horizon/tasks/config.yml index b052764095..0d427caeb4 100644 --- a/ansible/roles/horizon/tasks/config.yml +++ b/ansible/roles/horizon/tasks/config.yml @@ -13,7 +13,8 @@ set_fact: custom_policy: [] -- include_tasks: policy_item.yml +- name: Include tasks from policy_item.yml + include_tasks: policy_item.yml vars: project_name: "{{ item.name }}" when: item.enabled | bool @@ -132,6 +133,7 @@ - horizon_custom_themes | length > 0 with_items: "{{ horizon_custom_themes }}" -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - horizon_copy_certs | bool diff --git a/ansible/roles/horizon/tasks/deploy-containers.yml b/ansible/roles/horizon/tasks/deploy-containers.yml index eb24ab5c7a..4068eb35fe 100644 --- a/ansible/roles/horizon/tasks/deploy-containers.yml +++ b/ansible/roles/horizon/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check horizon containers + import_tasks: check-containers.yml diff --git a/ansible/roles/horizon/tasks/deploy.yml b/ansible/roles/horizon/tasks/deploy.yml index 2415269574..6e9088203d 100644 --- a/ansible/roles/horizon/tasks/deploy.yml +++ b/ansible/roles/horizon/tasks/deploy.yml @@ -1,13 +1,17 @@ --- -- import_tasks: config.yml +- name: Configure horizon + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check horizon containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone horizon repository + include_tasks: clone.yml when: - horizon_dev_mode | bool -- include_tasks: bootstrap.yml +- name: Include tasks from bootstrap.yml + include_tasks: bootstrap.yml when: horizon_backend_database | bool - name: Flush handlers diff --git a/ansible/roles/horizon/tasks/main.yml b/ansible/roles/horizon/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/horizon/tasks/main.yml +++ b/ansible/roles/horizon/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/horizon/tasks/precheck.yml b/ansible/roles/horizon/tasks/precheck.yml index 6eb9e2a373..7036ba654b 100644 --- a/ansible/roles/horizon/tasks/precheck.yml +++ b/ansible/roles/horizon/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck horizon configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ horizon_services }}" diff --git a/ansible/roles/horizon/tasks/pull.yml b/ansible/roles/horizon/tasks/pull.yml index 53f9c5fda1..78f8cea641 100644 --- a/ansible/roles/horizon/tasks/pull.yml +++ b/ansible/roles/horizon/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull horizon images + import_role: role: service-images-pull diff --git a/ansible/roles/horizon/tasks/reconfigure.yml b/ansible/roles/horizon/tasks/reconfigure.yml index 5b10a7e111..caf4c42f65 100644 --- a/ansible/roles/horizon/tasks/reconfigure.yml +++ b/ansible/roles/horizon/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy horizon + import_tasks: deploy.yml diff --git a/ansible/roles/horizon/tasks/stop.yml b/ansible/roles/horizon/tasks/stop.yml index ed10425a2d..d0b26b1035 100644 --- a/ansible/roles/horizon/tasks/stop.yml +++ b/ansible/roles/horizon/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop horizon containers + import_role: name: service-stop vars: project_services: "{{ horizon_services }}" diff --git a/ansible/roles/horizon/tasks/upgrade.yml b/ansible/roles/horizon/tasks/upgrade.yml index b8b6995811..91caff1b69 100644 --- a/ansible/roles/horizon/tasks/upgrade.yml +++ b/ansible/roles/horizon/tasks/upgrade.yml @@ -1,13 +1,17 @@ --- -- import_tasks: config.yml +- name: Configure horizon + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check horizon containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Include tasks from clone.yml + include_tasks: clone.yml when: - horizon_dev_mode | bool -- include_tasks: bootstrap_service.yml +- name: Include tasks from bootstrap_service.yml + include_tasks: bootstrap_service.yml when: horizon_backend_database | bool - name: Flush handlers diff --git a/ansible/roles/influxdb/tasks/check-containers.yml b/ansible/roles/influxdb/tasks/check-containers.yml index b7e2f7c29f..55b189bbb2 100644 --- a/ansible/roles/influxdb/tasks/check-containers.yml +++ b/ansible/roles/influxdb/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check influxdb containers + import_role: name: service-check-containers diff --git a/ansible/roles/influxdb/tasks/deploy-containers.yml b/ansible/roles/influxdb/tasks/deploy-containers.yml index eb24ab5c7a..3edc66f578 100644 --- a/ansible/roles/influxdb/tasks/deploy-containers.yml +++ b/ansible/roles/influxdb/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check influxdb containers + import_tasks: check-containers.yml diff --git a/ansible/roles/influxdb/tasks/deploy.yml b/ansible/roles/influxdb/tasks/deploy.yml index 49edff81e3..31823ae161 100644 --- a/ansible/roles/influxdb/tasks/deploy.yml +++ b/ansible/roles/influxdb/tasks/deploy.yml @@ -1,7 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure influxdb + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check influxdb containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/influxdb/tasks/main.yml b/ansible/roles/influxdb/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/influxdb/tasks/main.yml +++ b/ansible/roles/influxdb/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/influxdb/tasks/precheck.yml b/ansible/roles/influxdb/tasks/precheck.yml index a419af9ca7..2e2f4c6a3b 100644 --- a/ansible/roles/influxdb/tasks/precheck.yml +++ b/ansible/roles/influxdb/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck influxdb configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ influxdb_services }}" diff --git a/ansible/roles/influxdb/tasks/pull.yml b/ansible/roles/influxdb/tasks/pull.yml index 53f9c5fda1..e771f78454 100644 --- a/ansible/roles/influxdb/tasks/pull.yml +++ b/ansible/roles/influxdb/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull influxdb images + import_role: role: service-images-pull diff --git a/ansible/roles/influxdb/tasks/reconfigure.yml b/ansible/roles/influxdb/tasks/reconfigure.yml index 5b10a7e111..2e8cc03bd8 100644 --- a/ansible/roles/influxdb/tasks/reconfigure.yml +++ b/ansible/roles/influxdb/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy influxdb + import_tasks: deploy.yml diff --git a/ansible/roles/influxdb/tasks/stop.yml b/ansible/roles/influxdb/tasks/stop.yml index 5c0194eb48..7247fabfcc 100644 --- a/ansible/roles/influxdb/tasks/stop.yml +++ b/ansible/roles/influxdb/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop influxdb containers + import_role: name: service-stop vars: project_services: "{{ influxdb_services }}" diff --git a/ansible/roles/influxdb/tasks/upgrade.yml b/ansible/roles/influxdb/tasks/upgrade.yml index 49edff81e3..31823ae161 100644 --- a/ansible/roles/influxdb/tasks/upgrade.yml +++ b/ansible/roles/influxdb/tasks/upgrade.yml @@ -1,7 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure influxdb + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check influxdb containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/ironic/tasks/bootstrap.yml b/ansible/roles/ironic/tasks/bootstrap.yml index 8ed261602e..b87cd4c1e1 100644 --- a/ansible/roles/ironic/tasks/bootstrap.yml +++ b/ansible/roles/ironic/tasks/bootstrap.yml @@ -49,4 +49,5 @@ - not use_preconfigured_databases | bool - inventory_hostname in groups[item.group] -- import_tasks: bootstrap_service.yml +- name: Run ironic bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/ironic/tasks/check-containers.yml b/ansible/roles/ironic/tasks/check-containers.yml index b7e2f7c29f..e76f8be159 100644 --- a/ansible/roles/ironic/tasks/check-containers.yml +++ b/ansible/roles/ironic/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check ironic containers + import_role: name: service-check-containers diff --git a/ansible/roles/ironic/tasks/config.yml b/ansible/roles/ironic/tasks/config.yml index 9060fdd5af..0f955046e2 100644 --- a/ansible/roles/ironic/tasks/config.yml +++ b/ansible/roles/ironic/tasks/config.yml @@ -28,7 +28,8 @@ when: - ironic_policy.results | length > 0 -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - ironic_copy_certs | bool diff --git a/ansible/roles/ironic/tasks/config_validate.yml b/ansible/roles/ironic/tasks/config_validate.yml index 7b1806f346..b01a53d250 100644 --- a/ansible/roles/ironic/tasks/config_validate.yml +++ b/ansible/roles/ironic/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate ironic configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ ironic_services }}" diff --git a/ansible/roles/ironic/tasks/deploy-containers.yml b/ansible/roles/ironic/tasks/deploy-containers.yml index eb24ab5c7a..eb627bcdc1 100644 --- a/ansible/roles/ironic/tasks/deploy-containers.yml +++ b/ansible/roles/ironic/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check ironic containers + import_tasks: check-containers.yml diff --git a/ansible/roles/ironic/tasks/deploy.yml b/ansible/roles/ironic/tasks/deploy.yml index 9519d8e70f..e9266c4220 100644 --- a/ansible/roles/ironic/tasks/deploy.yml +++ b/ansible/roles/ironic/tasks/deploy.yml @@ -1,17 +1,23 @@ --- -- import_tasks: register.yml +- name: Register ironic in Keystone + import_tasks: register.yml when: ironic_enable_keystone_integration | bool -- import_tasks: config-host.yml +- name: Import tasks from config-host.yml + import_tasks: config-host.yml -- import_tasks: config.yml +- name: Configure ironic + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check ironic containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone ironic repository + include_tasks: clone.yml when: ironic_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap ironic service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/ironic/tasks/legacy_upgrade.yml b/ansible/roles/ironic/tasks/legacy_upgrade.yml index ccfc6f30fe..6b1bc37b8c 100644 --- a/ansible/roles/ironic/tasks/legacy_upgrade.yml +++ b/ansible/roles/ironic/tasks/legacy_upgrade.yml @@ -1,11 +1,15 @@ --- -- import_tasks: config-host.yml +- name: Import tasks from config-host.yml + import_tasks: config-host.yml -- import_tasks: config.yml +- name: Import tasks from config.yml + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Import tasks from check-containers.yml + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Import tasks from bootstrap_service.yml + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/ironic/tasks/main.yml b/ansible/roles/ironic/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/ironic/tasks/main.yml +++ b/ansible/roles/ironic/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/ironic/tasks/precheck.yml b/ansible/roles/ironic/tasks/precheck.yml index c066c47b58..b8ecb249bf 100644 --- a/ansible/roles/ironic/tasks/precheck.yml +++ b/ansible/roles/ironic/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck ironic configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ ironic_services }}" diff --git a/ansible/roles/ironic/tasks/pull.yml b/ansible/roles/ironic/tasks/pull.yml index 53f9c5fda1..d72c228489 100644 --- a/ansible/roles/ironic/tasks/pull.yml +++ b/ansible/roles/ironic/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull ironic images + import_role: role: service-images-pull diff --git a/ansible/roles/ironic/tasks/reconfigure.yml b/ansible/roles/ironic/tasks/reconfigure.yml index 5b10a7e111..7ab0cee404 100644 --- a/ansible/roles/ironic/tasks/reconfigure.yml +++ b/ansible/roles/ironic/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy ironic + import_tasks: deploy.yml diff --git a/ansible/roles/ironic/tasks/register.yml b/ansible/roles/ironic/tasks/register.yml index c101c8d731..a5e6130a8a 100644 --- a/ansible/roles/ironic/tasks/register.yml +++ b/ansible/roles/ironic/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register ironic service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_ironic_auth }}" diff --git a/ansible/roles/ironic/tasks/rolling_upgrade.yml b/ansible/roles/ironic/tasks/rolling_upgrade.yml index 673ab7d2bf..a9e4a8dfc9 100644 --- a/ansible/roles/ironic/tasks/rolling_upgrade.yml +++ b/ansible/roles/ironic/tasks/rolling_upgrade.yml @@ -1,5 +1,6 @@ --- -- import_tasks: config-host.yml +- name: Import tasks from config-host.yml + import_tasks: config-host.yml # Pin release version for rolling upgrades # This is only needed when performing a slow rolling upgrade process @@ -8,23 +9,29 @@ - name: Pin release version for rolling upgrades when: ironic_pin_release_version | length > 0 block: - - import_tasks: config.yml + - name: Import tasks from config.yml + import_tasks: config.yml vars: pin_release_version: "{{ ironic_pin_release_version }}" - - import_tasks: check-containers.yml + - name: Import tasks from check-containers.yml + import_tasks: check-containers.yml - - import_tasks: bootstrap_service.yml + - name: Import tasks from bootstrap_service.yml + import_tasks: bootstrap_service.yml # Restart ironic services with pinned release version - name: Flush handlers meta: flush_handlers -- import_tasks: config.yml +- name: Import tasks from config.yml + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Import tasks from check-containers.yml + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Import tasks from bootstrap_service.yml + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/ironic/tasks/stop.yml b/ansible/roles/ironic/tasks/stop.yml index a8db783707..78dae8616e 100644 --- a/ansible/roles/ironic/tasks/stop.yml +++ b/ansible/roles/ironic/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop ironic containers + import_role: name: service-stop vars: project_services: "{{ ironic_services }}" diff --git a/ansible/roles/ironic/tasks/upgrade.yml b/ansible/roles/ironic/tasks/upgrade.yml index 2e7b4d6b8e..d0daa8dfc2 100644 --- a/ansible/roles/ironic/tasks/upgrade.yml +++ b/ansible/roles/ironic/tasks/upgrade.yml @@ -80,10 +80,12 @@ - not ironic_upgrade_skip_wait_check | bool - container_facts.containers[container_name] is defined -- include_tasks: rolling_upgrade.yml +- name: Include tasks from rolling_upgrade.yml + include_tasks: rolling_upgrade.yml when: ironic_enable_rolling_upgrade | bool -- include_tasks: legacy_upgrade.yml +- name: Include tasks from legacy_upgrade.yml + include_tasks: legacy_upgrade.yml when: not ironic_enable_rolling_upgrade | bool # TODO(mnasiadka): Remove this task in Gazpacho/2026.1 release diff --git a/ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2 b/ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2 index 87c9cc196e..5e0a120877 100644 --- a/ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2 +++ b/ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2 @@ -11,6 +11,7 @@ bind-interfaces dhcp-range=set:{{ tag }},{{ item.range }},{{ lease_time }} {% if item.routers is defined %}dhcp-option=tag:{{ tag }},option:router,{{ item.routers }}{% endif %} {% if item.ntp_server is defined %}dhcp-option=tag:{{ tag }},option:ntp-server,{{ item.ntp_server }}{% endif %} +{% if item.dns_servers is defined %}dhcp-option=tag:{{ tag }},option:dns-server,{{ item.dns_servers }}{% endif %} {% endfor %} {% if api_address_family == 'ipv6' %} diff --git a/ansible/roles/iscsi/tasks/check-containers.yml b/ansible/roles/iscsi/tasks/check-containers.yml index b7e2f7c29f..a34efd551e 100644 --- a/ansible/roles/iscsi/tasks/check-containers.yml +++ b/ansible/roles/iscsi/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check iscsi containers + import_role: name: service-check-containers diff --git a/ansible/roles/iscsi/tasks/deploy-containers.yml b/ansible/roles/iscsi/tasks/deploy-containers.yml index eb24ab5c7a..d3e1b78e81 100644 --- a/ansible/roles/iscsi/tasks/deploy-containers.yml +++ b/ansible/roles/iscsi/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check iscsi containers + import_tasks: check-containers.yml diff --git a/ansible/roles/iscsi/tasks/deploy.yml b/ansible/roles/iscsi/tasks/deploy.yml index 514002b273..9a4bd0ae7f 100644 --- a/ansible/roles/iscsi/tasks/deploy.yml +++ b/ansible/roles/iscsi/tasks/deploy.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config-host.yml +- name: Import tasks from config-host.yml + import_tasks: config-host.yml -- import_tasks: config.yml +- name: Configure iscsi + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check iscsi containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/iscsi/tasks/main.yml b/ansible/roles/iscsi/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/iscsi/tasks/main.yml +++ b/ansible/roles/iscsi/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/iscsi/tasks/precheck.yml b/ansible/roles/iscsi/tasks/precheck.yml index 7b43d45ae9..8e1b9bdae1 100644 --- a/ansible/roles/iscsi/tasks/precheck.yml +++ b/ansible/roles/iscsi/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck iscsi configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ iscsi_services }}" diff --git a/ansible/roles/iscsi/tasks/pull.yml b/ansible/roles/iscsi/tasks/pull.yml index 53f9c5fda1..334b0206b6 100644 --- a/ansible/roles/iscsi/tasks/pull.yml +++ b/ansible/roles/iscsi/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull iscsi images + import_role: role: service-images-pull diff --git a/ansible/roles/iscsi/tasks/reconfigure.yml b/ansible/roles/iscsi/tasks/reconfigure.yml index 5b10a7e111..be803665f3 100644 --- a/ansible/roles/iscsi/tasks/reconfigure.yml +++ b/ansible/roles/iscsi/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy iscsi + import_tasks: deploy.yml diff --git a/ansible/roles/iscsi/tasks/stop.yml b/ansible/roles/iscsi/tasks/stop.yml index e828958c61..d18f07d13b 100644 --- a/ansible/roles/iscsi/tasks/stop.yml +++ b/ansible/roles/iscsi/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop iscsi containers + import_role: name: service-stop vars: project_services: "{{ iscsi_services }}" diff --git a/ansible/roles/iscsi/tasks/upgrade.yml b/ansible/roles/iscsi/tasks/upgrade.yml index 5b10a7e111..bdcead398a 100644 --- a/ansible/roles/iscsi/tasks/upgrade.yml +++ b/ansible/roles/iscsi/tasks/upgrade.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Import tasks from deploy.yml + import_tasks: deploy.yml diff --git a/ansible/roles/keystone/tasks/bootstrap.yml b/ansible/roles/keystone/tasks/bootstrap.yml index 89e4cdd004..b5cd3fb029 100644 --- a/ansible/roles/keystone/tasks/bootstrap.yml +++ b/ansible/roles/keystone/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run keystone bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/keystone/tasks/check-containers.yml b/ansible/roles/keystone/tasks/check-containers.yml index b7e2f7c29f..535c3f001c 100644 --- a/ansible/roles/keystone/tasks/check-containers.yml +++ b/ansible/roles/keystone/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check keystone containers + import_role: name: service-check-containers diff --git a/ansible/roles/keystone/tasks/config.yml b/ansible/roles/keystone/tasks/config.yml index f3f103dc2b..b68942e122 100644 --- a/ansible/roles/keystone/tasks/config.yml +++ b/ansible/roles/keystone/tasks/config.yml @@ -35,7 +35,8 @@ run_once: true register: keystone_domain_directory -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - keystone_copy_certs | bool @@ -120,7 +121,8 @@ - keystone_policy_file is defined with_dict: "{{ keystone_services | select_services_enabled_and_mapped_to_host }}" -- include_tasks: config-federation-oidc.yml +- name: Include tasks from config-federation-oidc.yml + include_tasks: config-federation-oidc.yml when: - keystone_enable_federation_openid | bool diff --git a/ansible/roles/keystone/tasks/config_validate.yml b/ansible/roles/keystone/tasks/config_validate.yml index 400463d208..c008b29422 100644 --- a/ansible/roles/keystone/tasks/config_validate.yml +++ b/ansible/roles/keystone/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate keystone configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ keystone_services }}" diff --git a/ansible/roles/keystone/tasks/deploy-containers.yml b/ansible/roles/keystone/tasks/deploy-containers.yml index eb24ab5c7a..d57f3b9069 100644 --- a/ansible/roles/keystone/tasks/deploy-containers.yml +++ b/ansible/roles/keystone/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check keystone containers + import_tasks: check-containers.yml diff --git a/ansible/roles/keystone/tasks/deploy.yml b/ansible/roles/keystone/tasks/deploy.yml index d71e7068d6..e96f4043b8 100644 --- a/ansible/roles/keystone/tasks/deploy.yml +++ b/ansible/roles/keystone/tasks/deploy.yml @@ -1,21 +1,28 @@ --- -- import_tasks: config.yml +- name: Configure keystone + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check keystone containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone keystone repository + include_tasks: clone.yml when: - keystone_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap keystone service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers -- include_tasks: distribute_fernet.yml +- name: Include tasks from distribute_fernet.yml + include_tasks: distribute_fernet.yml -- import_tasks: register.yml +- name: Register keystone in Keystone + import_tasks: register.yml -- include_tasks: register_identity_providers.yml +- name: Include tasks from register_identity_providers.yml + include_tasks: register_identity_providers.yml when: - enable_keystone_federation | bool diff --git a/ansible/roles/keystone/tasks/main.yml b/ansible/roles/keystone/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/keystone/tasks/main.yml +++ b/ansible/roles/keystone/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/keystone/tasks/precheck.yml b/ansible/roles/keystone/tasks/precheck.yml index d89fe76b77..707e1954c3 100644 --- a/ansible/roles/keystone/tasks/precheck.yml +++ b/ansible/roles/keystone/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck keystone configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ keystone_services }}" diff --git a/ansible/roles/keystone/tasks/pull.yml b/ansible/roles/keystone/tasks/pull.yml index 53f9c5fda1..56806a2b50 100644 --- a/ansible/roles/keystone/tasks/pull.yml +++ b/ansible/roles/keystone/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull keystone images + import_role: role: service-images-pull diff --git a/ansible/roles/keystone/tasks/reconfigure.yml b/ansible/roles/keystone/tasks/reconfigure.yml index 5b10a7e111..f6e6d05835 100644 --- a/ansible/roles/keystone/tasks/reconfigure.yml +++ b/ansible/roles/keystone/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy keystone + import_tasks: deploy.yml diff --git a/ansible/roles/keystone/tasks/register.yml b/ansible/roles/keystone/tasks/register.yml index 3789eb7216..681e5be501 100644 --- a/ansible/roles/keystone/tasks/register.yml +++ b/ansible/roles/keystone/tasks/register.yml @@ -11,7 +11,8 @@ run_once: true with_items: "{{ multiple_regions_names }}" -- import_role: +- name: Register keystone service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_keystone_auth }}" diff --git a/ansible/roles/keystone/tasks/stop.yml b/ansible/roles/keystone/tasks/stop.yml index fd6ed4cf39..b66c33e608 100644 --- a/ansible/roles/keystone/tasks/stop.yml +++ b/ansible/roles/keystone/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop keystone containers + import_role: name: service-stop vars: project_services: "{{ keystone_services }}" diff --git a/ansible/roles/keystone/tasks/upgrade.yml b/ansible/roles/keystone/tasks/upgrade.yml index e0ef6814f6..316177fca5 100644 --- a/ansible/roles/keystone/tasks/upgrade.yml +++ b/ansible/roles/keystone/tasks/upgrade.yml @@ -1,7 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure keystone + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check keystone containers + import_tasks: check-containers.yml - name: Enable log_bin_trust_function_creators function become: true diff --git a/ansible/roles/kuryr/tasks/check-containers.yml b/ansible/roles/kuryr/tasks/check-containers.yml index b7e2f7c29f..1720e608c7 100644 --- a/ansible/roles/kuryr/tasks/check-containers.yml +++ b/ansible/roles/kuryr/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check kuryr containers + import_role: name: service-check-containers diff --git a/ansible/roles/kuryr/tasks/config.yml b/ansible/roles/kuryr/tasks/config.yml index 6f6099cbcb..da67042186 100644 --- a/ansible/roles/kuryr/tasks/config.yml +++ b/ansible/roles/kuryr/tasks/config.yml @@ -28,7 +28,8 @@ when: - kuryr_policy.results | length > 0 -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - kuryr_copy_certs | bool diff --git a/ansible/roles/kuryr/tasks/config_validate.yml b/ansible/roles/kuryr/tasks/config_validate.yml index 9ed33e0f20..173191d5f4 100644 --- a/ansible/roles/kuryr/tasks/config_validate.yml +++ b/ansible/roles/kuryr/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate kuryr configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ kuryr_services }}" diff --git a/ansible/roles/kuryr/tasks/deploy-containers.yml b/ansible/roles/kuryr/tasks/deploy-containers.yml index eb24ab5c7a..f4fe47550b 100644 --- a/ansible/roles/kuryr/tasks/deploy-containers.yml +++ b/ansible/roles/kuryr/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check kuryr containers + import_tasks: check-containers.yml diff --git a/ansible/roles/kuryr/tasks/deploy.yml b/ansible/roles/kuryr/tasks/deploy.yml index d253fcbb82..610899aafc 100644 --- a/ansible/roles/kuryr/tasks/deploy.yml +++ b/ansible/roles/kuryr/tasks/deploy.yml @@ -1,11 +1,15 @@ --- -- import_tasks: register.yml +- name: Register kuryr in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure kuryr + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check kuryr containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone kuryr repository + include_tasks: clone.yml when: - kuryr_dev_mode | bool diff --git a/ansible/roles/kuryr/tasks/main.yml b/ansible/roles/kuryr/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/kuryr/tasks/main.yml +++ b/ansible/roles/kuryr/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/kuryr/tasks/precheck.yml b/ansible/roles/kuryr/tasks/precheck.yml index b33710b734..647c444c8c 100644 --- a/ansible/roles/kuryr/tasks/precheck.yml +++ b/ansible/roles/kuryr/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck kuryr configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ kuryr_services }}" diff --git a/ansible/roles/kuryr/tasks/pull.yml b/ansible/roles/kuryr/tasks/pull.yml index 53f9c5fda1..eb15fd582d 100644 --- a/ansible/roles/kuryr/tasks/pull.yml +++ b/ansible/roles/kuryr/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull kuryr images + import_role: role: service-images-pull diff --git a/ansible/roles/kuryr/tasks/reconfigure.yml b/ansible/roles/kuryr/tasks/reconfigure.yml index 5b10a7e111..b73505a9b0 100644 --- a/ansible/roles/kuryr/tasks/reconfigure.yml +++ b/ansible/roles/kuryr/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy kuryr + import_tasks: deploy.yml diff --git a/ansible/roles/kuryr/tasks/register.yml b/ansible/roles/kuryr/tasks/register.yml index 50e15f0e12..c98c8d56a0 100644 --- a/ansible/roles/kuryr/tasks/register.yml +++ b/ansible/roles/kuryr/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register kuryr service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_kuryr_auth }}" diff --git a/ansible/roles/kuryr/tasks/stop.yml b/ansible/roles/kuryr/tasks/stop.yml index bc445e3bfa..7a57f7b989 100644 --- a/ansible/roles/kuryr/tasks/stop.yml +++ b/ansible/roles/kuryr/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop kuryr containers + import_role: name: service-stop vars: project_services: "{{ kuryr_services }}" diff --git a/ansible/roles/kuryr/tasks/upgrade.yml b/ansible/roles/kuryr/tasks/upgrade.yml index 49edff81e3..defa84b742 100644 --- a/ansible/roles/kuryr/tasks/upgrade.yml +++ b/ansible/roles/kuryr/tasks/upgrade.yml @@ -1,7 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure kuryr + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check kuryr containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/letsencrypt/tasks/check-containers.yml b/ansible/roles/letsencrypt/tasks/check-containers.yml index b7e2f7c29f..9b13827942 100644 --- a/ansible/roles/letsencrypt/tasks/check-containers.yml +++ b/ansible/roles/letsencrypt/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check letsencrypt containers + import_role: name: service-check-containers diff --git a/ansible/roles/letsencrypt/tasks/config.yml b/ansible/roles/letsencrypt/tasks/config.yml index ff0490de0d..f26de83096 100644 --- a/ansible/roles/letsencrypt/tasks/config.yml +++ b/ansible/roles/letsencrypt/tasks/config.yml @@ -45,6 +45,7 @@ - { src: "letsencrypt-lego-run.sh.j2", dest: "letsencrypt-lego-run.sh" } when: service | service_enabled_and_mapped_to_host -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - letsencrypt_copy_certs | bool diff --git a/ansible/roles/letsencrypt/tasks/deploy-containers.yml b/ansible/roles/letsencrypt/tasks/deploy-containers.yml index eb24ab5c7a..1e6490cb50 100644 --- a/ansible/roles/letsencrypt/tasks/deploy-containers.yml +++ b/ansible/roles/letsencrypt/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check letsencrypt containers + import_tasks: check-containers.yml diff --git a/ansible/roles/letsencrypt/tasks/deploy.yml b/ansible/roles/letsencrypt/tasks/deploy.yml index 49edff81e3..467fe75c8d 100644 --- a/ansible/roles/letsencrypt/tasks/deploy.yml +++ b/ansible/roles/letsencrypt/tasks/deploy.yml @@ -1,7 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure letsencrypt + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check letsencrypt containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/letsencrypt/tasks/main.yml b/ansible/roles/letsencrypt/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/letsencrypt/tasks/main.yml +++ b/ansible/roles/letsencrypt/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/letsencrypt/tasks/pull.yml b/ansible/roles/letsencrypt/tasks/pull.yml index 53f9c5fda1..8baa866621 100644 --- a/ansible/roles/letsencrypt/tasks/pull.yml +++ b/ansible/roles/letsencrypt/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull letsencrypt images + import_role: role: service-images-pull diff --git a/ansible/roles/letsencrypt/tasks/reconfigure.yml b/ansible/roles/letsencrypt/tasks/reconfigure.yml index 5b10a7e111..bd031f31da 100644 --- a/ansible/roles/letsencrypt/tasks/reconfigure.yml +++ b/ansible/roles/letsencrypt/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy letsencrypt + import_tasks: deploy.yml diff --git a/ansible/roles/letsencrypt/tasks/stop.yml b/ansible/roles/letsencrypt/tasks/stop.yml index 9fbda55f16..12fc7f8738 100644 --- a/ansible/roles/letsencrypt/tasks/stop.yml +++ b/ansible/roles/letsencrypt/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop letsencrypt services + import_role: role: service-stop vars: project_services: "{{ letsencrypt_services }}" diff --git a/ansible/roles/letsencrypt/tasks/upgrade.yml b/ansible/roles/letsencrypt/tasks/upgrade.yml index 5b10a7e111..bdcead398a 100644 --- a/ansible/roles/letsencrypt/tasks/upgrade.yml +++ b/ansible/roles/letsencrypt/tasks/upgrade.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Import tasks from deploy.yml + import_tasks: deploy.yml diff --git a/ansible/roles/loadbalancer/tasks/check-containers.yml b/ansible/roles/loadbalancer/tasks/check-containers.yml index b7e2f7c29f..7fa8a48417 100644 --- a/ansible/roles/loadbalancer/tasks/check-containers.yml +++ b/ansible/roles/loadbalancer/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check loadbalancer containers + import_role: name: service-check-containers diff --git a/ansible/roles/loadbalancer/tasks/config.yml b/ansible/roles/loadbalancer/tasks/config.yml index 8f64b58e38..99f34c4f29 100644 --- a/ansible/roles/loadbalancer/tasks/config.yml +++ b/ansible/roles/loadbalancer/tasks/config.yml @@ -166,7 +166,8 @@ - "{{ node_custom_config }}/keepalived/keepalived.conf" - "keepalived/keepalived.conf.j2" -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - loadbalancer_copy_certs | bool diff --git a/ansible/roles/loadbalancer/tasks/deploy-containers.yml b/ansible/roles/loadbalancer/tasks/deploy-containers.yml index eb24ab5c7a..24a6dd0139 100644 --- a/ansible/roles/loadbalancer/tasks/deploy-containers.yml +++ b/ansible/roles/loadbalancer/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check loadbalancer containers + import_tasks: check-containers.yml diff --git a/ansible/roles/loadbalancer/tasks/deploy.yml b/ansible/roles/loadbalancer/tasks/deploy.yml index 8532ea3396..7fc3e5787c 100644 --- a/ansible/roles/loadbalancer/tasks/deploy.yml +++ b/ansible/roles/loadbalancer/tasks/deploy.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config-host.yml +- name: Import tasks from config-host.yml + import_tasks: config-host.yml -- import_tasks: config.yml +- name: Configure loadbalancer + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check loadbalancer containers + import_tasks: check-containers.yml # NOTE(yoctozepto): haproxy role handlers should not be flushed early. # site.yml handles all haproxy things in a dedicated play. diff --git a/ansible/roles/loadbalancer/tasks/main.yml b/ansible/roles/loadbalancer/tasks/main.yml index 61bef8fc90..915bf9c7cf 100644 --- a/ansible/roles/loadbalancer/tasks/main.yml +++ b/ansible/roles/loadbalancer/tasks/main.yml @@ -1,3 +1,4 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" when: inventory_hostname in groups['loadbalancer'] diff --git a/ansible/roles/loadbalancer/tasks/precheck.yml b/ansible/roles/loadbalancer/tasks/precheck.yml index cdb211f320..b997c671e4 100644 --- a/ansible/roles/loadbalancer/tasks/precheck.yml +++ b/ansible/roles/loadbalancer/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck loadbalancer configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ loadbalancer_services }}" @@ -55,7 +56,8 @@ haproxy_vip_prechecks: "{{ all_hosts_in_batch and groups['haproxy_running_True'] is not defined }}" proxysql_vip_prechecks: "{{ all_hosts_in_batch and groups['proxysql_running_True'] is not defined }}" -- when: +- name: Check external haproxy certificate existence + when: - not kolla_externally_managed_cert | bool - letsencrypt_managed_certs == 'internal' or letsencrypt_managed_certs == '' - kolla_enable_tls_external | bool @@ -74,7 +76,8 @@ that: haproxy_cert_file.stat.exists fail_msg: "External haproxy certificate file is not found. It is configured via 'kolla_external_fqdn_cert'" -- when: +- name: Check internal haproxy certificate existence + when: - not kolla_externally_managed_cert | bool - letsencrypt_managed_certs == 'external' or letsencrypt_managed_certs == '' - kolla_enable_tls_internal | bool diff --git a/ansible/roles/loadbalancer/tasks/pull.yml b/ansible/roles/loadbalancer/tasks/pull.yml index 53f9c5fda1..45c1e90852 100644 --- a/ansible/roles/loadbalancer/tasks/pull.yml +++ b/ansible/roles/loadbalancer/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull loadbalancer images + import_role: role: service-images-pull diff --git a/ansible/roles/loadbalancer/tasks/reconfigure.yml b/ansible/roles/loadbalancer/tasks/reconfigure.yml index 5b10a7e111..1f1ce6fc9b 100644 --- a/ansible/roles/loadbalancer/tasks/reconfigure.yml +++ b/ansible/roles/loadbalancer/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy loadbalancer + import_tasks: deploy.yml diff --git a/ansible/roles/loadbalancer/tasks/stop.yml b/ansible/roles/loadbalancer/tasks/stop.yml index e4f0e49d8a..b622be6955 100644 --- a/ansible/roles/loadbalancer/tasks/stop.yml +++ b/ansible/roles/loadbalancer/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop loadbalancer containers + import_role: name: service-stop vars: project_services: "{{ loadbalancer_services }}" diff --git a/ansible/roles/loadbalancer/tasks/upgrade.yml b/ansible/roles/loadbalancer/tasks/upgrade.yml index 88e10327eb..7e2ffb6418 100644 --- a/ansible/roles/loadbalancer/tasks/upgrade.yml +++ b/ansible/roles/loadbalancer/tasks/upgrade.yml @@ -36,4 +36,5 @@ when: - inventory_hostname in groups['loadbalancer'] -- import_tasks: deploy.yml +- name: Import tasks from deploy.yml + import_tasks: deploy.yml diff --git a/ansible/roles/magnum/tasks/bootstrap.yml b/ansible/roles/magnum/tasks/bootstrap.yml index 4fb78ea307..bc670bc2b5 100644 --- a/ansible/roles/magnum/tasks/bootstrap.yml +++ b/ansible/roles/magnum/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run magnum bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/magnum/tasks/check-containers.yml b/ansible/roles/magnum/tasks/check-containers.yml index b7e2f7c29f..73a1b07385 100644 --- a/ansible/roles/magnum/tasks/check-containers.yml +++ b/ansible/roles/magnum/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check magnum containers + import_role: name: service-check-containers diff --git a/ansible/roles/magnum/tasks/config.yml b/ansible/roles/magnum/tasks/config.yml index 187ce56b4e..5d609a6473 100644 --- a/ansible/roles/magnum/tasks/config.yml +++ b/ansible/roles/magnum/tasks/config.yml @@ -51,7 +51,8 @@ when: - magnum_kubeconfig_file.stat.exists -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - magnum_copy_certs | bool diff --git a/ansible/roles/magnum/tasks/config_validate.yml b/ansible/roles/magnum/tasks/config_validate.yml index fae91de74e..310cfe3350 100644 --- a/ansible/roles/magnum/tasks/config_validate.yml +++ b/ansible/roles/magnum/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate magnum configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ magnum_services }}" diff --git a/ansible/roles/magnum/tasks/deploy-containers.yml b/ansible/roles/magnum/tasks/deploy-containers.yml index eb24ab5c7a..925e5a81ea 100644 --- a/ansible/roles/magnum/tasks/deploy-containers.yml +++ b/ansible/roles/magnum/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check magnum containers + import_tasks: check-containers.yml diff --git a/ansible/roles/magnum/tasks/deploy.yml b/ansible/roles/magnum/tasks/deploy.yml index b6c9648280..b6a942a910 100644 --- a/ansible/roles/magnum/tasks/deploy.yml +++ b/ansible/roles/magnum/tasks/deploy.yml @@ -1,14 +1,19 @@ --- -- import_tasks: register.yml +- name: Register magnum in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure magnum + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check magnum containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone magnum repository + include_tasks: clone.yml when: magnum_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap magnum service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/magnum/tasks/main.yml b/ansible/roles/magnum/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/magnum/tasks/main.yml +++ b/ansible/roles/magnum/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/magnum/tasks/precheck.yml b/ansible/roles/magnum/tasks/precheck.yml index da22f10e40..1280e5f6fe 100644 --- a/ansible/roles/magnum/tasks/precheck.yml +++ b/ansible/roles/magnum/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck magnum configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ magnum_services }}" diff --git a/ansible/roles/magnum/tasks/pull.yml b/ansible/roles/magnum/tasks/pull.yml index 53f9c5fda1..cf8dd2be38 100644 --- a/ansible/roles/magnum/tasks/pull.yml +++ b/ansible/roles/magnum/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull magnum images + import_role: role: service-images-pull diff --git a/ansible/roles/magnum/tasks/reconfigure.yml b/ansible/roles/magnum/tasks/reconfigure.yml index 5b10a7e111..97cde50f5a 100644 --- a/ansible/roles/magnum/tasks/reconfigure.yml +++ b/ansible/roles/magnum/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy magnum + import_tasks: deploy.yml diff --git a/ansible/roles/magnum/tasks/register.yml b/ansible/roles/magnum/tasks/register.yml index 3cdf06be26..7667ca11b5 100644 --- a/ansible/roles/magnum/tasks/register.yml +++ b/ansible/roles/magnum/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register magnum service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_magnum_auth }}" diff --git a/ansible/roles/magnum/tasks/stop.yml b/ansible/roles/magnum/tasks/stop.yml index 93d8874c2f..b530b121d9 100644 --- a/ansible/roles/magnum/tasks/stop.yml +++ b/ansible/roles/magnum/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop magnum containers + import_role: name: service-stop vars: project_services: "{{ magnum_services }}" diff --git a/ansible/roles/magnum/tasks/upgrade.yml b/ansible/roles/magnum/tasks/upgrade.yml index 6ba9f99799..bb79d4094a 100644 --- a/ansible/roles/magnum/tasks/upgrade.yml +++ b/ansible/roles/magnum/tasks/upgrade.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure magnum + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check magnum containers + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Run magnum bootstrap container + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/manila/tasks/bootstrap.yml b/ansible/roles/manila/tasks/bootstrap.yml index c04f95d97b..574c2333f9 100644 --- a/ansible/roles/manila/tasks/bootstrap.yml +++ b/ansible/roles/manila/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run manila bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/manila/tasks/check-containers.yml b/ansible/roles/manila/tasks/check-containers.yml index b7e2f7c29f..9e4ffa8b76 100644 --- a/ansible/roles/manila/tasks/check-containers.yml +++ b/ansible/roles/manila/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check manila containers + import_role: name: service-check-containers diff --git a/ansible/roles/manila/tasks/config.yml b/ansible/roles/manila/tasks/config.yml index 0cb6ae9454..989d97a6f2 100644 --- a/ansible/roles/manila/tasks/config.yml +++ b/ansible/roles/manila/tasks/config.yml @@ -9,7 +9,8 @@ become: true with_dict: "{{ manila_services | select_services_enabled_and_mapped_to_host }}" -- include_tasks: external_ceph.yml +- name: Include tasks from external_ceph.yml + include_tasks: external_ceph.yml when: - (enable_manila_backend_cephfs_native | bool) or (enable_manila_backend_cephfs_nfs | bool) - inventory_hostname in groups['manila-share'] @@ -33,7 +34,8 @@ when: - manila_policy.results | length > 0 -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - manila_copy_certs | bool diff --git a/ansible/roles/manila/tasks/config_validate.yml b/ansible/roles/manila/tasks/config_validate.yml index 6f14e38f6b..d65b00dc57 100644 --- a/ansible/roles/manila/tasks/config_validate.yml +++ b/ansible/roles/manila/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate manila configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ manila_services }}" diff --git a/ansible/roles/manila/tasks/deploy-containers.yml b/ansible/roles/manila/tasks/deploy-containers.yml index eb24ab5c7a..ae5a18e99c 100644 --- a/ansible/roles/manila/tasks/deploy-containers.yml +++ b/ansible/roles/manila/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check manila containers + import_tasks: check-containers.yml diff --git a/ansible/roles/manila/tasks/deploy.yml b/ansible/roles/manila/tasks/deploy.yml index 0e342217f5..d4cde7633d 100644 --- a/ansible/roles/manila/tasks/deploy.yml +++ b/ansible/roles/manila/tasks/deploy.yml @@ -1,14 +1,19 @@ --- -- include_tasks: clone.yml +- name: Clone manila repository + include_tasks: clone.yml when: manila_dev_mode | bool -- import_tasks: register.yml +- name: Register manila in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure manila + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check manila containers + import_tasks: check-containers.yml -- import_tasks: bootstrap.yml +- name: Bootstrap manila service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/manila/tasks/main.yml b/ansible/roles/manila/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/manila/tasks/main.yml +++ b/ansible/roles/manila/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/manila/tasks/precheck.yml b/ansible/roles/manila/tasks/precheck.yml index 59c9675e35..04c7b799e7 100644 --- a/ansible/roles/manila/tasks/precheck.yml +++ b/ansible/roles/manila/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck manila configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ manila_services }}" diff --git a/ansible/roles/manila/tasks/pull.yml b/ansible/roles/manila/tasks/pull.yml index 53f9c5fda1..0e38e8ddeb 100644 --- a/ansible/roles/manila/tasks/pull.yml +++ b/ansible/roles/manila/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull manila images + import_role: role: service-images-pull diff --git a/ansible/roles/manila/tasks/reconfigure.yml b/ansible/roles/manila/tasks/reconfigure.yml index 5b10a7e111..4c6c147de8 100644 --- a/ansible/roles/manila/tasks/reconfigure.yml +++ b/ansible/roles/manila/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy manila + import_tasks: deploy.yml diff --git a/ansible/roles/manila/tasks/register.yml b/ansible/roles/manila/tasks/register.yml index d8af77c0f5..5e9f3cd404 100644 --- a/ansible/roles/manila/tasks/register.yml +++ b/ansible/roles/manila/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register manila service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_manila_auth }}" diff --git a/ansible/roles/manila/tasks/stop.yml b/ansible/roles/manila/tasks/stop.yml index 07f2d2368a..0b0528240d 100644 --- a/ansible/roles/manila/tasks/stop.yml +++ b/ansible/roles/manila/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop manila containers + import_role: name: service-stop vars: project_services: "{{ manila_services }}" diff --git a/ansible/roles/manila/tasks/upgrade.yml b/ansible/roles/manila/tasks/upgrade.yml index 6ba9f99799..578c89afa3 100644 --- a/ansible/roles/manila/tasks/upgrade.yml +++ b/ansible/roles/manila/tasks/upgrade.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure manila + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check manila containers + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Run manila bootstrap container + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/mariadb/tasks/bootstrap.yml b/ansible/roles/mariadb/tasks/bootstrap.yml index 1ff1cc764b..5abd32746a 100644 --- a/ansible/roles/mariadb/tasks/bootstrap.yml +++ b/ansible/roles/mariadb/tasks/bootstrap.yml @@ -1,10 +1,13 @@ --- -- import_tasks: lookup_cluster.yml +- name: Import tasks from lookup_cluster.yml + import_tasks: lookup_cluster.yml -- include_tasks: bootstrap_cluster.yml +- name: Include tasks from bootstrap_cluster.yml + include_tasks: bootstrap_cluster.yml when: - not mariadb_cluster_exists - inventory_hostname == groups[mariadb_shard_group][0] -- include_tasks: recover_cluster.yml +- name: Include tasks from recover_cluster.yml + include_tasks: recover_cluster.yml when: mariadb_recover | default(False) diff --git a/ansible/roles/mariadb/tasks/check-containers.yml b/ansible/roles/mariadb/tasks/check-containers.yml index b7e2f7c29f..a5e39352f1 100644 --- a/ansible/roles/mariadb/tasks/check-containers.yml +++ b/ansible/roles/mariadb/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check mariadb containers + import_role: name: service-check-containers diff --git a/ansible/roles/mariadb/tasks/config.yml b/ansible/roles/mariadb/tasks/config.yml index 405e34ffbd..d456613b60 100644 --- a/ansible/roles/mariadb/tasks/config.yml +++ b/ansible/roles/mariadb/tasks/config.yml @@ -86,6 +86,7 @@ - mariadb_enable_healthchecks | bool - service | service_enabled_and_mapped_to_host -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - mariadb_copy_certs | bool diff --git a/ansible/roles/mariadb/tasks/deploy-containers.yml b/ansible/roles/mariadb/tasks/deploy-containers.yml index 8a1a708698..4cf3b72226 100644 --- a/ansible/roles/mariadb/tasks/deploy-containers.yml +++ b/ansible/roles/mariadb/tasks/deploy-containers.yml @@ -1,5 +1,7 @@ --- -- import_tasks: check-containers.yml +- name: Check mariadb containers + import_tasks: check-containers.yml # NOTE(yoctozepto): handlers prerequisite -- import_tasks: lookup_cluster.yml +- name: Import tasks from lookup_cluster.yml + import_tasks: lookup_cluster.yml diff --git a/ansible/roles/mariadb/tasks/deploy.yml b/ansible/roles/mariadb/tasks/deploy.yml index 9fca6f5a3c..559433982a 100644 --- a/ansible/roles/mariadb/tasks/deploy.yml +++ b/ansible/roles/mariadb/tasks/deploy.yml @@ -1,11 +1,15 @@ --- -- import_tasks: config.yml +- name: Configure mariadb + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check mariadb containers + import_tasks: check-containers.yml -- import_tasks: recover_cluster.yml +- name: Import tasks from recover_cluster.yml + import_tasks: recover_cluster.yml vars: mariadb_cluster_exists: true when: migration_flag is defined -- import_tasks: bootstrap.yml +- name: Bootstrap mariadb service + import_tasks: bootstrap.yml diff --git a/ansible/roles/mariadb/tasks/lookup_cluster.yml b/ansible/roles/mariadb/tasks/lookup_cluster.yml index 73d22d1481..d65ae3a0fb 100644 --- a/ansible/roles/mariadb/tasks/lookup_cluster.yml +++ b/ansible/roles/mariadb/tasks/lookup_cluster.yml @@ -17,7 +17,8 @@ set_fact: mariadb_cluster_exists: "{{ groups[mariadb_shard_group + '_had_volume_True'] is defined }}" -- when: not mariadb_recover | default(False) +- name: Check MariaDB port liveness and cluster status + when: not mariadb_recover | default(False) block: - name: Check MariaDB service port liveness wait_for: @@ -43,7 +44,8 @@ - mariadb_cluster_exists - groups[mariadb_shard_group + '_port_alive_True'] is not defined - - when: + - name: Check MariaDB WSREP sync status + when: - groups[mariadb_shard_group + '_port_alive_True'] is defined - inventory_hostname in groups[mariadb_shard_group + '_port_alive_True'] block: diff --git a/ansible/roles/mariadb/tasks/main.yml b/ansible/roles/mariadb/tasks/main.yml index 5bd3cc9423..ff69fc2da2 100644 --- a/ansible/roles/mariadb/tasks/main.yml +++ b/ansible/roles/mariadb/tasks/main.yml @@ -6,4 +6,5 @@ loop: "{{ groups['mariadb'] }}" changed_when: false -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/mariadb/tasks/post-deploy.yml b/ansible/roles/mariadb/tasks/post-deploy.yml index c487e00be4..929abd7fb2 100644 --- a/ansible/roles/mariadb/tasks/post-deploy.yml +++ b/ansible/roles/mariadb/tasks/post-deploy.yml @@ -1,4 +1,6 @@ --- -- import_tasks: register.yml +- name: Import tasks from register.yml + import_tasks: register.yml -- import_tasks: check.yml +- name: Import tasks from check.yml + import_tasks: check.yml diff --git a/ansible/roles/mariadb/tasks/precheck.yml b/ansible/roles/mariadb/tasks/precheck.yml index 9c53170410..e3d5448dd7 100644 --- a/ansible/roles/mariadb/tasks/precheck.yml +++ b/ansible/roles/mariadb/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck mariadb configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ mariadb_services }}" diff --git a/ansible/roles/mariadb/tasks/pull.yml b/ansible/roles/mariadb/tasks/pull.yml index 53f9c5fda1..89764ee736 100644 --- a/ansible/roles/mariadb/tasks/pull.yml +++ b/ansible/roles/mariadb/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull mariadb images + import_role: role: service-images-pull diff --git a/ansible/roles/mariadb/tasks/reconfigure.yml b/ansible/roles/mariadb/tasks/reconfigure.yml index 5b10a7e111..3d878dca8a 100644 --- a/ansible/roles/mariadb/tasks/reconfigure.yml +++ b/ansible/roles/mariadb/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy mariadb + import_tasks: deploy.yml diff --git a/ansible/roles/mariadb/tasks/recover_cluster.yml b/ansible/roles/mariadb/tasks/recover_cluster.yml index e78d747ecd..47614d7124 100644 --- a/ansible/roles/mariadb/tasks/recover_cluster.yml +++ b/ansible/roles/mariadb/tasks/recover_cluster.yml @@ -15,7 +15,8 @@ run_once: true with_fileglob: "/tmp/kolla_mariadb_recover_inventory_name_*" -- when: +- name: Perform MariaDB wsrep recovery operations + when: - mariadb_recover_inventory_name is not defined block: - name: Stop MariaDB containers @@ -259,4 +260,5 @@ retries: 10 delay: 6 -- import_tasks: check.yml +- name: Import tasks from check.yml + import_tasks: check.yml diff --git a/ansible/roles/mariadb/tasks/stop.yml b/ansible/roles/mariadb/tasks/stop.yml index f70237bd6c..2a0485876c 100644 --- a/ansible/roles/mariadb/tasks/stop.yml +++ b/ansible/roles/mariadb/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop mariadb containers + import_role: name: service-stop vars: project_services: "{{ mariadb_services }}" diff --git a/ansible/roles/mariadb/tasks/upgrade.yml b/ansible/roles/mariadb/tasks/upgrade.yml index 3f328a3713..5409b32e53 100644 --- a/ansible/roles/mariadb/tasks/upgrade.yml +++ b/ansible/roles/mariadb/tasks/upgrade.yml @@ -5,10 +5,11 @@ no_log: true shell: > {{ kolla_container_engine }} exec {{ mariadb_service.container_name }} - mysql -uroot -p{{ database_password }} + mariadb -uroot -p{{ database_password }} -e "SET GLOBAL wsrep_sst_method='rsync';" -- import_tasks: deploy.yml +- name: Import tasks from deploy.yml + import_tasks: deploy.yml vars: mariadb_wsrep_sst_method: "rsync" @@ -18,10 +19,11 @@ no_log: true shell: > {{ kolla_container_engine }} exec {{ mariadb_service.container_name }} - mysql -uroot -p{{ database_password }} + mariadb -uroot -p{{ database_password }} -e "SET GLOBAL wsrep_sst_method='mariabackup';" -- import_tasks: deploy.yml +- name: Import tasks from deploy.yml + import_tasks: deploy.yml # TODO(seunghun1ee): Remove this task after 2026.1 - name: "Stop and remove mariadb_clustercheck containers" diff --git a/ansible/roles/masakari/tasks/bootstrap.yml b/ansible/roles/masakari/tasks/bootstrap.yml index 6b5f9d1b0c..dfaa720d0c 100644 --- a/ansible/roles/masakari/tasks/bootstrap.yml +++ b/ansible/roles/masakari/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run masakari bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/masakari/tasks/check-containers.yml b/ansible/roles/masakari/tasks/check-containers.yml index b7e2f7c29f..4641a358bc 100644 --- a/ansible/roles/masakari/tasks/check-containers.yml +++ b/ansible/roles/masakari/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check masakari containers + import_role: name: service-check-containers diff --git a/ansible/roles/masakari/tasks/config.yml b/ansible/roles/masakari/tasks/config.yml index 2edbcdb355..e5d7ef8713 100644 --- a/ansible/roles/masakari/tasks/config.yml +++ b/ansible/roles/masakari/tasks/config.yml @@ -46,7 +46,8 @@ become: true with_dict: "{{ masakari_services | select_services_enabled_and_mapped_to_host }}" -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - masakari_copy_certs | bool diff --git a/ansible/roles/masakari/tasks/config_validate.yml b/ansible/roles/masakari/tasks/config_validate.yml index de3be4b384..47c4cf296a 100644 --- a/ansible/roles/masakari/tasks/config_validate.yml +++ b/ansible/roles/masakari/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate masakari configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ masakari_services }}" diff --git a/ansible/roles/masakari/tasks/deploy-containers.yml b/ansible/roles/masakari/tasks/deploy-containers.yml index eb24ab5c7a..f2d99663cd 100644 --- a/ansible/roles/masakari/tasks/deploy-containers.yml +++ b/ansible/roles/masakari/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check masakari containers + import_tasks: check-containers.yml diff --git a/ansible/roles/masakari/tasks/deploy.yml b/ansible/roles/masakari/tasks/deploy.yml index e8edec1c09..095e792546 100644 --- a/ansible/roles/masakari/tasks/deploy.yml +++ b/ansible/roles/masakari/tasks/deploy.yml @@ -1,14 +1,19 @@ --- -- import_tasks: register.yml +- name: Register masakari in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure masakari + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check masakari containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone masakari repository + include_tasks: clone.yml when: masakari_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap masakari service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/masakari/tasks/main.yml b/ansible/roles/masakari/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/masakari/tasks/main.yml +++ b/ansible/roles/masakari/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/masakari/tasks/precheck.yml b/ansible/roles/masakari/tasks/precheck.yml index a5486ac615..810795c6a3 100644 --- a/ansible/roles/masakari/tasks/precheck.yml +++ b/ansible/roles/masakari/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck masakari configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ masakari_services }}" diff --git a/ansible/roles/masakari/tasks/pull.yml b/ansible/roles/masakari/tasks/pull.yml index 53f9c5fda1..e8f8e947f0 100644 --- a/ansible/roles/masakari/tasks/pull.yml +++ b/ansible/roles/masakari/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull masakari images + import_role: role: service-images-pull diff --git a/ansible/roles/masakari/tasks/reconfigure.yml b/ansible/roles/masakari/tasks/reconfigure.yml index 5b10a7e111..abf777d94e 100644 --- a/ansible/roles/masakari/tasks/reconfigure.yml +++ b/ansible/roles/masakari/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy masakari + import_tasks: deploy.yml diff --git a/ansible/roles/masakari/tasks/register.yml b/ansible/roles/masakari/tasks/register.yml index 9f2413ad77..756cba4467 100644 --- a/ansible/roles/masakari/tasks/register.yml +++ b/ansible/roles/masakari/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register masakari service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_masakari_auth }}" diff --git a/ansible/roles/masakari/tasks/stop.yml b/ansible/roles/masakari/tasks/stop.yml index 2b07065815..512628c2ab 100644 --- a/ansible/roles/masakari/tasks/stop.yml +++ b/ansible/roles/masakari/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop masakari containers + import_role: name: service-stop vars: project_services: "{{ masakari_services }}" diff --git a/ansible/roles/masakari/tasks/upgrade.yml b/ansible/roles/masakari/tasks/upgrade.yml index 6ba9f99799..3afa14573c 100644 --- a/ansible/roles/masakari/tasks/upgrade.yml +++ b/ansible/roles/masakari/tasks/upgrade.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure masakari + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check masakari containers + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Run masakari bootstrap container + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/memcached/tasks/check-containers.yml b/ansible/roles/memcached/tasks/check-containers.yml index b7e2f7c29f..9e8bc832f0 100644 --- a/ansible/roles/memcached/tasks/check-containers.yml +++ b/ansible/roles/memcached/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check memcached containers + import_role: name: service-check-containers diff --git a/ansible/roles/memcached/tasks/deploy-containers.yml b/ansible/roles/memcached/tasks/deploy-containers.yml index eb24ab5c7a..57d2a93591 100644 --- a/ansible/roles/memcached/tasks/deploy-containers.yml +++ b/ansible/roles/memcached/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check memcached containers + import_tasks: check-containers.yml diff --git a/ansible/roles/memcached/tasks/deploy.yml b/ansible/roles/memcached/tasks/deploy.yml index 651076c4c5..88d48dba73 100644 --- a/ansible/roles/memcached/tasks/deploy.yml +++ b/ansible/roles/memcached/tasks/deploy.yml @@ -1,4 +1,6 @@ --- -- import_tasks: config.yml +- name: Configure memcached + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check memcached containers + import_tasks: check-containers.yml diff --git a/ansible/roles/memcached/tasks/main.yml b/ansible/roles/memcached/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/memcached/tasks/main.yml +++ b/ansible/roles/memcached/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/memcached/tasks/precheck.yml b/ansible/roles/memcached/tasks/precheck.yml index 189e7dd2b3..be1ff6f649 100644 --- a/ansible/roles/memcached/tasks/precheck.yml +++ b/ansible/roles/memcached/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck memcached configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ memcached_services }}" diff --git a/ansible/roles/memcached/tasks/pull.yml b/ansible/roles/memcached/tasks/pull.yml index 53f9c5fda1..549718dd07 100644 --- a/ansible/roles/memcached/tasks/pull.yml +++ b/ansible/roles/memcached/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull memcached images + import_role: role: service-images-pull diff --git a/ansible/roles/memcached/tasks/reconfigure.yml b/ansible/roles/memcached/tasks/reconfigure.yml index 5b10a7e111..9edb15c861 100644 --- a/ansible/roles/memcached/tasks/reconfigure.yml +++ b/ansible/roles/memcached/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy memcached + import_tasks: deploy.yml diff --git a/ansible/roles/memcached/tasks/stop.yml b/ansible/roles/memcached/tasks/stop.yml index 2535818ab7..e2607dfbc8 100644 --- a/ansible/roles/memcached/tasks/stop.yml +++ b/ansible/roles/memcached/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop memcached containers + import_role: name: service-stop vars: project_services: "{{ memcached_services }}" diff --git a/ansible/roles/memcached/tasks/upgrade.yml b/ansible/roles/memcached/tasks/upgrade.yml index 651076c4c5..88d48dba73 100644 --- a/ansible/roles/memcached/tasks/upgrade.yml +++ b/ansible/roles/memcached/tasks/upgrade.yml @@ -1,4 +1,6 @@ --- -- import_tasks: config.yml +- name: Configure memcached + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check memcached containers + import_tasks: check-containers.yml diff --git a/ansible/roles/mistral/tasks/bootstrap.yml b/ansible/roles/mistral/tasks/bootstrap.yml index 4e7cb2b2f9..d9155456cc 100644 --- a/ansible/roles/mistral/tasks/bootstrap.yml +++ b/ansible/roles/mistral/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run mistral bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/mistral/tasks/check-containers.yml b/ansible/roles/mistral/tasks/check-containers.yml index b7e2f7c29f..24ec04d1c5 100644 --- a/ansible/roles/mistral/tasks/check-containers.yml +++ b/ansible/roles/mistral/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check mistral containers + import_role: name: service-check-containers diff --git a/ansible/roles/mistral/tasks/config.yml b/ansible/roles/mistral/tasks/config.yml index aba2fbf273..0bcff4f9e7 100644 --- a/ansible/roles/mistral/tasks/config.yml +++ b/ansible/roles/mistral/tasks/config.yml @@ -28,7 +28,8 @@ when: - mistral_policy.results | length > 0 -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - mistral_copy_certs | bool diff --git a/ansible/roles/mistral/tasks/config_validate.yml b/ansible/roles/mistral/tasks/config_validate.yml index 91fad6d18f..2bf041e50b 100644 --- a/ansible/roles/mistral/tasks/config_validate.yml +++ b/ansible/roles/mistral/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate mistral configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ mistral_services }}" diff --git a/ansible/roles/mistral/tasks/deploy-containers.yml b/ansible/roles/mistral/tasks/deploy-containers.yml index eb24ab5c7a..f408f1a74d 100644 --- a/ansible/roles/mistral/tasks/deploy-containers.yml +++ b/ansible/roles/mistral/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check mistral containers + import_tasks: check-containers.yml diff --git a/ansible/roles/mistral/tasks/deploy.yml b/ansible/roles/mistral/tasks/deploy.yml index e0c2b34837..49ad3e5c5c 100644 --- a/ansible/roles/mistral/tasks/deploy.yml +++ b/ansible/roles/mistral/tasks/deploy.yml @@ -1,14 +1,19 @@ --- -- import_tasks: register.yml +- name: Register mistral in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure mistral + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check mistral containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone mistral repository + include_tasks: clone.yml when: mistral_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap mistral service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/mistral/tasks/main.yml b/ansible/roles/mistral/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/mistral/tasks/main.yml +++ b/ansible/roles/mistral/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/mistral/tasks/precheck.yml b/ansible/roles/mistral/tasks/precheck.yml index 5ffb84ae7a..a49bd7bf26 100644 --- a/ansible/roles/mistral/tasks/precheck.yml +++ b/ansible/roles/mistral/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck mistral configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ mistral_services }}" diff --git a/ansible/roles/mistral/tasks/pull.yml b/ansible/roles/mistral/tasks/pull.yml index 53f9c5fda1..3c84ae1f1c 100644 --- a/ansible/roles/mistral/tasks/pull.yml +++ b/ansible/roles/mistral/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull mistral images + import_role: role: service-images-pull diff --git a/ansible/roles/mistral/tasks/reconfigure.yml b/ansible/roles/mistral/tasks/reconfigure.yml index 5b10a7e111..a34ae3507d 100644 --- a/ansible/roles/mistral/tasks/reconfigure.yml +++ b/ansible/roles/mistral/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy mistral + import_tasks: deploy.yml diff --git a/ansible/roles/mistral/tasks/register.yml b/ansible/roles/mistral/tasks/register.yml index c0f0822fae..60623ead99 100644 --- a/ansible/roles/mistral/tasks/register.yml +++ b/ansible/roles/mistral/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register mistral service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_mistral_auth }}" diff --git a/ansible/roles/mistral/tasks/stop.yml b/ansible/roles/mistral/tasks/stop.yml index 3f85f2e00a..d2b4ab582c 100644 --- a/ansible/roles/mistral/tasks/stop.yml +++ b/ansible/roles/mistral/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop mistral containers + import_role: name: service-stop vars: project_services: "{{ mistral_services }}" diff --git a/ansible/roles/mistral/tasks/upgrade.yml b/ansible/roles/mistral/tasks/upgrade.yml index 6ba9f99799..2b8a9f519b 100644 --- a/ansible/roles/mistral/tasks/upgrade.yml +++ b/ansible/roles/mistral/tasks/upgrade.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure mistral + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check mistral containers + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Run mistral bootstrap container + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/multipathd/tasks/check-containers.yml b/ansible/roles/multipathd/tasks/check-containers.yml index b7e2f7c29f..565ac2d109 100644 --- a/ansible/roles/multipathd/tasks/check-containers.yml +++ b/ansible/roles/multipathd/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check multipathd containers + import_role: name: service-check-containers diff --git a/ansible/roles/multipathd/tasks/deploy-containers.yml b/ansible/roles/multipathd/tasks/deploy-containers.yml index eb24ab5c7a..18e6bb0522 100644 --- a/ansible/roles/multipathd/tasks/deploy-containers.yml +++ b/ansible/roles/multipathd/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check multipathd containers + import_tasks: check-containers.yml diff --git a/ansible/roles/multipathd/tasks/deploy.yml b/ansible/roles/multipathd/tasks/deploy.yml index 514002b273..db308dbc1b 100644 --- a/ansible/roles/multipathd/tasks/deploy.yml +++ b/ansible/roles/multipathd/tasks/deploy.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config-host.yml +- name: Import tasks from config-host.yml + import_tasks: config-host.yml -- import_tasks: config.yml +- name: Configure multipathd + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check multipathd containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/multipathd/tasks/main.yml b/ansible/roles/multipathd/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/multipathd/tasks/main.yml +++ b/ansible/roles/multipathd/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/multipathd/tasks/precheck.yml b/ansible/roles/multipathd/tasks/precheck.yml index 307c52a959..c3200dc3cb 100644 --- a/ansible/roles/multipathd/tasks/precheck.yml +++ b/ansible/roles/multipathd/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck multipathd configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ multipathd_services }}" diff --git a/ansible/roles/multipathd/tasks/pull.yml b/ansible/roles/multipathd/tasks/pull.yml index 53f9c5fda1..56fb2c6b2b 100644 --- a/ansible/roles/multipathd/tasks/pull.yml +++ b/ansible/roles/multipathd/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull multipathd images + import_role: role: service-images-pull diff --git a/ansible/roles/multipathd/tasks/reconfigure.yml b/ansible/roles/multipathd/tasks/reconfigure.yml index 5b10a7e111..7cebde26b5 100644 --- a/ansible/roles/multipathd/tasks/reconfigure.yml +++ b/ansible/roles/multipathd/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy multipathd + import_tasks: deploy.yml diff --git a/ansible/roles/multipathd/tasks/stop.yml b/ansible/roles/multipathd/tasks/stop.yml index 66a7d46e1a..679723b8e5 100644 --- a/ansible/roles/multipathd/tasks/stop.yml +++ b/ansible/roles/multipathd/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop multipathd containers + import_role: name: service-stop vars: project_services: "{{ multipathd_services }}" diff --git a/ansible/roles/multipathd/tasks/upgrade.yml b/ansible/roles/multipathd/tasks/upgrade.yml index 514002b273..db308dbc1b 100644 --- a/ansible/roles/multipathd/tasks/upgrade.yml +++ b/ansible/roles/multipathd/tasks/upgrade.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config-host.yml +- name: Import tasks from config-host.yml + import_tasks: config-host.yml -- import_tasks: config.yml +- name: Configure multipathd + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check multipathd containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/neutron/tasks/bootstrap.yml b/ansible/roles/neutron/tasks/bootstrap.yml index b7afe8e98c..1939194912 100644 --- a/ansible/roles/neutron/tasks/bootstrap.yml +++ b/ansible/roles/neutron/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run neutron bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/neutron/tasks/check-containers.yml b/ansible/roles/neutron/tasks/check-containers.yml index b7e2f7c29f..14febf9370 100644 --- a/ansible/roles/neutron/tasks/check-containers.yml +++ b/ansible/roles/neutron/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check neutron containers + import_role: name: service-check-containers diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml index 76705426e2..fa5c2dd900 100644 --- a/ansible/roles/neutron/tasks/config.yml +++ b/ansible/roles/neutron/tasks/config.yml @@ -17,7 +17,8 @@ changed_when: false register: check_extra_ml2_plugins -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - neutron_copy_certs | bool diff --git a/ansible/roles/neutron/tasks/config_validate.yml b/ansible/roles/neutron/tasks/config_validate.yml index 5459c7b014..849d06f077 100644 --- a/ansible/roles/neutron/tasks/config_validate.yml +++ b/ansible/roles/neutron/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate neutron configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ neutron_services }}" diff --git a/ansible/roles/neutron/tasks/deploy-containers.yml b/ansible/roles/neutron/tasks/deploy-containers.yml index eb24ab5c7a..927443c8e2 100644 --- a/ansible/roles/neutron/tasks/deploy-containers.yml +++ b/ansible/roles/neutron/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check neutron containers + import_tasks: check-containers.yml diff --git a/ansible/roles/neutron/tasks/deploy.yml b/ansible/roles/neutron/tasks/deploy.yml index 68a1f941d7..49dcf5f63f 100644 --- a/ansible/roles/neutron/tasks/deploy.yml +++ b/ansible/roles/neutron/tasks/deploy.yml @@ -1,23 +1,31 @@ --- -- import_tasks: neutron_plugin_agent_check.yml +- name: Import tasks from neutron_plugin_agent_check.yml + import_tasks: neutron_plugin_agent_check.yml -- import_tasks: register.yml +- name: Register neutron in Keystone + import_tasks: register.yml -- include_tasks: clone.yml +- name: Clone neutron repository + include_tasks: clone.yml when: neutron_dev_mode | bool -- import_tasks: config-host.yml +- name: Import tasks from config-host.yml + import_tasks: config-host.yml -- import_tasks: config.yml +- name: Configure neutron + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check neutron containers + import_tasks: check-containers.yml -- include_tasks: config-neutron-fake.yml +- name: Include tasks from config-neutron-fake.yml + include_tasks: config-neutron-fake.yml when: - enable_nova_fake | bool - inventory_hostname in groups['compute'] -- import_tasks: bootstrap.yml +- name: Bootstrap neutron service + import_tasks: bootstrap.yml - name: Flush Handlers meta: flush_handlers diff --git a/ansible/roles/neutron/tasks/legacy_upgrade.yml b/ansible/roles/neutron/tasks/legacy_upgrade.yml index 21f682c04b..6fc0286da5 100644 --- a/ansible/roles/neutron/tasks/legacy_upgrade.yml +++ b/ansible/roles/neutron/tasks/legacy_upgrade.yml @@ -1,16 +1,21 @@ --- -- import_tasks: config-host.yml +- name: Import tasks from config-host.yml + import_tasks: config-host.yml -- import_tasks: config.yml +- name: Import tasks from config.yml + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Import tasks from check-containers.yml + import_tasks: check-containers.yml -- include_tasks: config-neutron-fake.yml +- name: Include tasks from config-neutron-fake.yml + include_tasks: config-neutron-fake.yml when: - inventory_hostname in groups['compute'] - enable_nova_fake | bool -- import_tasks: bootstrap_service.yml +- name: Import tasks from bootstrap_service.yml + import_tasks: bootstrap_service.yml - name: Flush Handlers meta: flush_handlers diff --git a/ansible/roles/neutron/tasks/main.yml b/ansible/roles/neutron/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/neutron/tasks/main.yml +++ b/ansible/roles/neutron/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/neutron/tasks/precheck.yml b/ansible/roles/neutron/tasks/precheck.yml index 46ba3db3d2..424520ab3c 100644 --- a/ansible/roles/neutron/tasks/precheck.yml +++ b/ansible/roles/neutron/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck neutron configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ neutron_services }}" @@ -68,4 +69,5 @@ when: - neutron_dns_integration | bool -- import_tasks: neutron_plugin_agent_check.yml +- name: Import tasks from neutron_plugin_agent_check.yml + import_tasks: neutron_plugin_agent_check.yml diff --git a/ansible/roles/neutron/tasks/pull.yml b/ansible/roles/neutron/tasks/pull.yml index 53f9c5fda1..956505722d 100644 --- a/ansible/roles/neutron/tasks/pull.yml +++ b/ansible/roles/neutron/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull neutron images + import_role: role: service-images-pull diff --git a/ansible/roles/neutron/tasks/reconfigure.yml b/ansible/roles/neutron/tasks/reconfigure.yml index 5b10a7e111..d2540496a4 100644 --- a/ansible/roles/neutron/tasks/reconfigure.yml +++ b/ansible/roles/neutron/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy neutron + import_tasks: deploy.yml diff --git a/ansible/roles/neutron/tasks/register.yml b/ansible/roles/neutron/tasks/register.yml index 17a6ca2cb9..d1e5c326b0 100644 --- a/ansible/roles/neutron/tasks/register.yml +++ b/ansible/roles/neutron/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register neutron service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_neutron_auth }}" diff --git a/ansible/roles/neutron/tasks/rolling_upgrade.yml b/ansible/roles/neutron/tasks/rolling_upgrade.yml index 68201443f9..bf205f00d7 100644 --- a/ansible/roles/neutron/tasks/rolling_upgrade.yml +++ b/ansible/roles/neutron/tasks/rolling_upgrade.yml @@ -1,11 +1,15 @@ --- -- import_tasks: config-host.yml +- name: Import tasks from config-host.yml + import_tasks: config-host.yml -- import_tasks: config.yml +- name: Import tasks from config.yml + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Import tasks from check-containers.yml + import_tasks: check-containers.yml -- include_tasks: config-neutron-fake.yml +- name: Include tasks from config-neutron-fake.yml + include_tasks: config-neutron-fake.yml when: - inventory_hostname in groups['compute'] - enable_nova_fake | bool diff --git a/ansible/roles/neutron/tasks/stop.yml b/ansible/roles/neutron/tasks/stop.yml index 3cc8dd28ab..d040a7c5dd 100644 --- a/ansible/roles/neutron/tasks/stop.yml +++ b/ansible/roles/neutron/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop neutron containers + import_role: name: service-stop vars: project_services: "{{ neutron_services }}" diff --git a/ansible/roles/neutron/tasks/upgrade.yml b/ansible/roles/neutron/tasks/upgrade.yml index d85bf0e944..ea366f29a5 100644 --- a/ansible/roles/neutron/tasks/upgrade.yml +++ b/ansible/roles/neutron/tasks/upgrade.yml @@ -16,10 +16,13 @@ state: absent when: inventory_hostname in groups['neutron-server'] | default([]) -- import_tasks: neutron_plugin_agent_check.yml +- name: Import tasks from neutron_plugin_agent_check.yml + import_tasks: neutron_plugin_agent_check.yml -- include_tasks: rolling_upgrade.yml +- name: Include tasks from rolling_upgrade.yml + include_tasks: rolling_upgrade.yml when: neutron_enable_rolling_upgrade | bool -- include_tasks: legacy_upgrade.yml +- name: Include tasks from legacy_upgrade.yml + include_tasks: legacy_upgrade.yml when: not neutron_enable_rolling_upgrade | bool diff --git a/ansible/roles/nova-cell/tasks/bootstrap.yml b/ansible/roles/nova-cell/tasks/bootstrap.yml index fa240ffefa..751d4af922 100644 --- a/ansible/roles/nova-cell/tasks/bootstrap.yml +++ b/ansible/roles/nova-cell/tasks/bootstrap.yml @@ -36,10 +36,14 @@ - inventory_hostname == groups[nova_cell_conductor_group][0] no_log: true -- import_tasks: rabbitmq.yml +- name: Import tasks from rabbitmq.yml + import_tasks: rabbitmq.yml -- import_tasks: config_bootstrap.yml +- name: Import tasks from config_bootstrap.yml + import_tasks: config_bootstrap.yml -- import_tasks: bootstrap_service.yml +- name: Run nova-cell bootstrap container + import_tasks: bootstrap_service.yml -- import_tasks: create_cells.yml +- name: Import tasks from create_cells.yml + import_tasks: create_cells.yml diff --git a/ansible/roles/nova-cell/tasks/bootstrap_upgrade.yml b/ansible/roles/nova-cell/tasks/bootstrap_upgrade.yml index 5fd0221c80..6c1d18b734 100644 --- a/ansible/roles/nova-cell/tasks/bootstrap_upgrade.yml +++ b/ansible/roles/nova-cell/tasks/bootstrap_upgrade.yml @@ -1,5 +1,7 @@ --- # For upgrade, we need to apply DB schema migrations to the cell databases. -- import_tasks: config_bootstrap.yml -- import_tasks: bootstrap_service.yml +- name: Import tasks from config_bootstrap.yml + import_tasks: config_bootstrap.yml +- name: Import tasks from bootstrap_service.yml + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/nova-cell/tasks/cell_proxy_loadbalancer.yml b/ansible/roles/nova-cell/tasks/cell_proxy_loadbalancer.yml index e57839e800..e8bb008c68 100644 --- a/ansible/roles/nova-cell/tasks/cell_proxy_loadbalancer.yml +++ b/ansible/roles/nova-cell/tasks/cell_proxy_loadbalancer.yml @@ -1,6 +1,7 @@ --- # Configure HAProxy for one cell for a particular console proxy type. -- import_role: +- name: Configure HAProxy for cell console proxy + import_role: name: loadbalancer-config vars: project_services: "{{ cell_proxy_project_services | namespace_haproxy_for_cell(cell_name) }}" diff --git a/ansible/roles/nova-cell/tasks/check-containers.yml b/ansible/roles/nova-cell/tasks/check-containers.yml index b7e2f7c29f..032c55d82c 100644 --- a/ansible/roles/nova-cell/tasks/check-containers.yml +++ b/ansible/roles/nova-cell/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check nova-cell containers + import_role: name: service-check-containers diff --git a/ansible/roles/nova-cell/tasks/config.yml b/ansible/roles/nova-cell/tasks/config.yml index c2da1e528f..98a476fe9d 100644 --- a/ansible/roles/nova-cell/tasks/config.yml +++ b/ansible/roles/nova-cell/tasks/config.yml @@ -9,11 +9,13 @@ mode: "0770" with_dict: "{{ nova_cell_services | select_services_enabled_and_mapped_to_host }}" -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - nova_cell_copy_certs | bool -- include_tasks: external_ceph.yml +- name: Include tasks from external_ceph.yml + include_tasks: external_ceph.yml when: - (nova_backend == "rbd" or cinder_backend_ceph | bool) - inventory_hostname in groups[nova_cell_compute_group] diff --git a/ansible/roles/nova-cell/tasks/config_validate.yml b/ansible/roles/nova-cell/tasks/config_validate.yml index 70ed89f91a..4ac35cd2af 100644 --- a/ansible/roles/nova-cell/tasks/config_validate.yml +++ b/ansible/roles/nova-cell/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate nova-cell configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ nova_cell_services }}" diff --git a/ansible/roles/nova-cell/tasks/create_cells.yml b/ansible/roles/nova-cell/tasks/create_cells.yml index 0d6f0fafec..e9904fb7ba 100644 --- a/ansible/roles/nova-cell/tasks/create_cells.yml +++ b/ansible/roles/nova-cell/tasks/create_cells.yml @@ -1,5 +1,6 @@ --- -- import_tasks: get_cell_settings.yml +- name: Import tasks from get_cell_settings.yml + import_tasks: get_cell_settings.yml when: - inventory_hostname == groups[nova_conductor.group][0] | default(None) diff --git a/ansible/roles/nova-cell/tasks/deploy-containers.yml b/ansible/roles/nova-cell/tasks/deploy-containers.yml index eb24ab5c7a..cceab830e9 100644 --- a/ansible/roles/nova-cell/tasks/deploy-containers.yml +++ b/ansible/roles/nova-cell/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check nova-cell containers + import_tasks: check-containers.yml diff --git a/ansible/roles/nova-cell/tasks/deploy.yml b/ansible/roles/nova-cell/tasks/deploy.yml index ab9c91c587..17c4198ba3 100644 --- a/ansible/roles/nova-cell/tasks/deploy.yml +++ b/ansible/roles/nova-cell/tasks/deploy.yml @@ -1,16 +1,22 @@ --- -- include_tasks: clone.yml +- name: Clone nova-cell repository + include_tasks: clone.yml when: nova_dev_mode | bool -- import_tasks: version-check.yml +- name: Import tasks from version-check.yml + import_tasks: version-check.yml -- import_tasks: config-host.yml +- name: Import tasks from config-host.yml + import_tasks: config-host.yml -- import_tasks: config.yml +- name: Configure nova-cell + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check nova-cell containers + import_tasks: check-containers.yml -- include_tasks: config-nova-fake.yml +- name: Include tasks from config-nova-fake.yml + include_tasks: config-nova-fake.yml when: - enable_nova_fake | bool - inventory_hostname in groups[nova_cell_compute_group] @@ -18,7 +24,8 @@ - name: Flush handlers meta: flush_handlers -- import_tasks: wait_discover_computes.yml +- name: Import tasks from wait_discover_computes.yml + import_tasks: wait_discover_computes.yml vars: # List of virtualised compute hypervisors in this Ansible play batch. virt_computes_in_batch: >- diff --git a/ansible/roles/nova-cell/tasks/discover_computes.yml b/ansible/roles/nova-cell/tasks/discover_computes.yml index 99a2b0627f..c65401ea8a 100644 --- a/ansible/roles/nova-cell/tasks/discover_computes.yml +++ b/ansible/roles/nova-cell/tasks/discover_computes.yml @@ -1,12 +1,14 @@ --- # Discover compute hosts for a cell. -- # Delegate to a cell conductor. +# Delegate to a cell conductor. +- name: Discover compute hosts for cell delegate_to: "{{ groups[nova_cell_conductor_group][0] }}" # Fail all hosts if any of these once-per-cell tasks fail. any_errors_fatal: true block: - - import_tasks: get_cell_settings.yml + - name: Import tasks from get_cell_settings.yml + import_tasks: get_cell_settings.yml - name: Fail if cell settings not found fail: diff --git a/ansible/roles/nova-cell/tasks/external_ceph.yml b/ansible/roles/nova-cell/tasks/external_ceph.yml index dc20c6ad1e..09a5ac46d6 100644 --- a/ansible/roles/nova-cell/tasks/external_ceph.yml +++ b/ansible/roles/nova-cell/tasks/external_ceph.yml @@ -97,7 +97,8 @@ - service | service_enabled_and_mapped_to_host - nova_backend == "rbd" -- when: +- name: Copy ceph.conf for host libvirt + when: - not enable_nova_libvirt_container | bool - inventory_hostname in groups[nova_cell_compute_group] - nova_backend == "rbd" @@ -128,7 +129,8 @@ mode: "0644" become: true -- vars: +- name: Configure libvirt secrets for external Ceph + vars: libvirt_secrets_dir: >- {{ (node_config_directory ~ '/nova-libvirt/secrets') if enable_nova_libvirt_container | bool diff --git a/ansible/roles/nova-cell/tasks/libvirt-cleanup.yml b/ansible/roles/nova-cell/tasks/libvirt-cleanup.yml index 3aebb173b0..994ce22201 100644 --- a/ansible/roles/nova-cell/tasks/libvirt-cleanup.yml +++ b/ansible/roles/nova-cell/tasks/libvirt-cleanup.yml @@ -15,7 +15,8 @@ - nova_libvirt register: container_facts -- when: container_facts.containers['nova_libvirt'] is defined +- name: Check and stop nova_libvirt container + when: container_facts.containers['nova_libvirt'] is defined block: # NOTE(mgoddard): pgrep exit status 1 means no match. - name: Check if there are any running VMs @@ -63,7 +64,8 @@ state: "absent" # Revert the changes applied in config-host.yml. -- when: +- name: Revert host libvirt configuration changes + when: - nova_compute_virt_type == 'kvm' block: - name: Remove udev kolla kvm rules diff --git a/ansible/roles/nova-cell/tasks/loadbalancer.yml b/ansible/roles/nova-cell/tasks/loadbalancer.yml index 16b6e53cbe..0ff2bcd705 100644 --- a/ansible/roles/nova-cell/tasks/loadbalancer.yml +++ b/ansible/roles/nova-cell/tasks/loadbalancer.yml @@ -18,7 +18,8 @@ # 'cell_proxy_group' in 'cell_proxy_project_services' that will be the loop_var # in proxy_loadbalancer.yml. -- import_tasks: proxy_loadbalancer.yml +- name: Import tasks from proxy_loadbalancer.yml + import_tasks: proxy_loadbalancer.yml vars: # Default is necessary because this play may not be targeting the hosts in # the nova-novncproxy group, and therefore they would not have role @@ -55,7 +56,8 @@ - "timeout tunnel 1h" tags: always -- import_tasks: proxy_loadbalancer.yml +- name: Import tasks from proxy_loadbalancer.yml + import_tasks: proxy_loadbalancer.yml vars: # Default is necessary because this play may not be targeting the hosts in # the nova-spicehtml5proxy group, and therefore they would not have role @@ -92,7 +94,8 @@ - "timeout tunnel {{ haproxy_nova_spicehtml5_proxy_tunnel_timeout }}" tags: always -- import_tasks: proxy_loadbalancer.yml +- name: Import tasks from proxy_loadbalancer.yml + import_tasks: proxy_loadbalancer.yml vars: # Default is necessary because this play may not be targeting the hosts in # the nova-serialproxy group, and therefore they would not have role diff --git a/ansible/roles/nova-cell/tasks/main.yml b/ansible/roles/nova-cell/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/nova-cell/tasks/main.yml +++ b/ansible/roles/nova-cell/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/nova-cell/tasks/precheck.yml b/ansible/roles/nova-cell/tasks/precheck.yml index 01dfb3290f..72c4c1ec63 100644 --- a/ansible/roles/nova-cell/tasks/precheck.yml +++ b/ansible/roles/nova-cell/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck nova-cell configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ nova_cell_services }}" diff --git a/ansible/roles/nova-cell/tasks/pull.yml b/ansible/roles/nova-cell/tasks/pull.yml index 53f9c5fda1..ccd218bdc0 100644 --- a/ansible/roles/nova-cell/tasks/pull.yml +++ b/ansible/roles/nova-cell/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull nova-cell images + import_role: role: service-images-pull diff --git a/ansible/roles/nova-cell/tasks/rabbitmq.yml b/ansible/roles/nova-cell/tasks/rabbitmq.yml index 62cade4477..f84af752c2 100644 --- a/ansible/roles/nova-cell/tasks/rabbitmq.yml +++ b/ansible/roles/nova-cell/tasks/rabbitmq.yml @@ -1,10 +1,12 @@ --- # Create RabbitMQ users and vhosts. -- when: +- name: Create RabbitMQ users and vhosts for nova-cell + when: - nova_cell_rpc_transport == 'rabbit' - enable_rabbitmq | bool block: - - import_role: + - name: Create RabbitMQ RPC users for nova-cell + import_role: name: service-rabbitmq vars: service_rabbitmq_users: "{{ nova_cell_rpc_rabbitmq_users }}" @@ -14,7 +16,8 @@ # Delegate to a host in the RPC group. service_rabbitmq_delegate_host: "{{ groups[nova_cell_rpc_group_name][0] | default }}" - - import_role: + - name: Create RabbitMQ notify users for nova-cell + import_role: name: service-rabbitmq vars: service_rabbitmq_users: "{{ nova_cell_notify_rabbitmq_users }}" diff --git a/ansible/roles/nova-cell/tasks/reconfigure.yml b/ansible/roles/nova-cell/tasks/reconfigure.yml index 5b10a7e111..9956523d7a 100644 --- a/ansible/roles/nova-cell/tasks/reconfigure.yml +++ b/ansible/roles/nova-cell/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy nova-cell + import_tasks: deploy.yml diff --git a/ansible/roles/nova-cell/tasks/rolling_upgrade.yml b/ansible/roles/nova-cell/tasks/rolling_upgrade.yml index b1637ad8a2..8644b35853 100644 --- a/ansible/roles/nova-cell/tasks/rolling_upgrade.yml +++ b/ansible/roles/nova-cell/tasks/rolling_upgrade.yml @@ -1,11 +1,14 @@ --- # Configure host settings. -- import_tasks: config-host.yml +- name: Import tasks from config-host.yml + import_tasks: config-host.yml # Create new set of configs on nodes -- import_tasks: config.yml +- name: Import tasks from config.yml + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Import tasks from check-containers.yml + import_tasks: check-containers.yml # TODO(donghm): Flush_handlers to restart nova services # should be run in serial nodes to decrease downtime if diff --git a/ansible/roles/nova-cell/tasks/stop.yml b/ansible/roles/nova-cell/tasks/stop.yml index 34c08e055c..180988ce91 100644 --- a/ansible/roles/nova-cell/tasks/stop.yml +++ b/ansible/roles/nova-cell/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop nova-cell containers + import_role: name: service-stop vars: project_services: "{{ nova_cell_services }}" diff --git a/ansible/roles/nova-cell/tasks/upgrade.yml b/ansible/roles/nova-cell/tasks/upgrade.yml index eb96f8bc1d..8ac0ab933a 100644 --- a/ansible/roles/nova-cell/tasks/upgrade.yml +++ b/ansible/roles/nova-cell/tasks/upgrade.yml @@ -1,5 +1,6 @@ --- -- import_tasks: version-check.yml +- name: Import tasks from version-check.yml + import_tasks: version-check.yml - name: Stopping nova cell services become: true @@ -13,4 +14,5 @@ - item.key in nova_cell_services_require_nova_conf - nova_safety_upgrade | bool -- import_tasks: rolling_upgrade.yml +- name: Import tasks from rolling_upgrade.yml + import_tasks: rolling_upgrade.yml diff --git a/ansible/roles/nova-cell/tasks/version-check.yml b/ansible/roles/nova-cell/tasks/version-check.yml index b66640587b..2626aada76 100644 --- a/ansible/roles/nova-cell/tasks/version-check.yml +++ b/ansible/roles/nova-cell/tasks/version-check.yml @@ -1,5 +1,6 @@ --- -- when: enable_nova_libvirt_container | bool and (groups[service.group] | length) > 0 +- name: Check Libvirt version compatibility + when: enable_nova_libvirt_container | bool and (groups[service.group] | length) > 0 vars: service_name: "nova-libvirt" service: "{{ nova_cell_services[service_name] }}" diff --git a/ansible/roles/nova-cell/tasks/wait_discover_computes.yml b/ansible/roles/nova-cell/tasks/wait_discover_computes.yml index cded1381a1..b8cb6b7fe3 100644 --- a/ansible/roles/nova-cell/tasks/wait_discover_computes.yml +++ b/ansible/roles/nova-cell/tasks/wait_discover_computes.yml @@ -4,7 +4,8 @@ # ironic compute services. # Work with --limit by including only hosts in ansible_play_batch. -- vars: +- name: Wait for compute services to register and discover hosts + vars: # For virt, use ansible_facts.nodename rather than inventory_hostname, since this # is similar to what nova uses internally as its default for the # [DEFAULT] host config option. diff --git a/ansible/roles/nova/tasks/bootstrap.yml b/ansible/roles/nova/tasks/bootstrap.yml index 53b65cb4ab..e89608f7a2 100644 --- a/ansible/roles/nova/tasks/bootstrap.yml +++ b/ansible/roles/nova/tasks/bootstrap.yml @@ -48,11 +48,15 @@ - not use_preconfigured_databases | bool no_log: true -- import_tasks: config_bootstrap.yml +- name: Import tasks from config_bootstrap.yml + import_tasks: config_bootstrap.yml -- include_tasks: clone.yml +- name: Include tasks from clone.yml + include_tasks: clone.yml when: nova_dev_mode | bool -- import_tasks: bootstrap_service.yml +- name: Run nova bootstrap container + import_tasks: bootstrap_service.yml -- import_tasks: map_cell0.yml +- name: Import tasks from map_cell0.yml + import_tasks: map_cell0.yml diff --git a/ansible/roles/nova/tasks/bootstrap_upgrade.yml b/ansible/roles/nova/tasks/bootstrap_upgrade.yml index 66142c8f2c..0407476cb6 100644 --- a/ansible/roles/nova/tasks/bootstrap_upgrade.yml +++ b/ansible/roles/nova/tasks/bootstrap_upgrade.yml @@ -2,5 +2,7 @@ # For upgrade, we need to apply DB schema migrations to the API and cell0 # databases. -- import_tasks: config_bootstrap.yml -- import_tasks: bootstrap_service.yml +- name: Import tasks from config_bootstrap.yml + import_tasks: config_bootstrap.yml +- name: Import tasks from bootstrap_service.yml + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/nova/tasks/check-containers.yml b/ansible/roles/nova/tasks/check-containers.yml index b7e2f7c29f..fb715740a9 100644 --- a/ansible/roles/nova/tasks/check-containers.yml +++ b/ansible/roles/nova/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check nova containers + import_role: name: service-check-containers diff --git a/ansible/roles/nova/tasks/config.yml b/ansible/roles/nova/tasks/config.yml index 8df855380c..af55329c4c 100644 --- a/ansible/roles/nova/tasks/config.yml +++ b/ansible/roles/nova/tasks/config.yml @@ -41,7 +41,8 @@ when: - vendordata_file.stat.exists -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - nova_copy_certs | bool diff --git a/ansible/roles/nova/tasks/config_validate.yml b/ansible/roles/nova/tasks/config_validate.yml index 8f011d3ecb..1b1ff12dee 100644 --- a/ansible/roles/nova/tasks/config_validate.yml +++ b/ansible/roles/nova/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate nova configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ nova_services }}" diff --git a/ansible/roles/nova/tasks/deploy-containers.yml b/ansible/roles/nova/tasks/deploy-containers.yml index eb24ab5c7a..90c5727f16 100644 --- a/ansible/roles/nova/tasks/deploy-containers.yml +++ b/ansible/roles/nova/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check nova containers + import_tasks: check-containers.yml diff --git a/ansible/roles/nova/tasks/deploy.yml b/ansible/roles/nova/tasks/deploy.yml index 9155c24cea..6db52cb694 100644 --- a/ansible/roles/nova/tasks/deploy.yml +++ b/ansible/roles/nova/tasks/deploy.yml @@ -1,9 +1,12 @@ --- -- import_tasks: register.yml +- name: Register nova in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure nova + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check nova containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/nova/tasks/main.yml b/ansible/roles/nova/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/nova/tasks/main.yml +++ b/ansible/roles/nova/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/nova/tasks/map_cell0.yml b/ansible/roles/nova/tasks/map_cell0.yml index 612a6426a9..6bb5ceeca8 100644 --- a/ansible/roles/nova/tasks/map_cell0.yml +++ b/ansible/roles/nova/tasks/map_cell0.yml @@ -1,5 +1,6 @@ --- -- run_once: true +- name: Create and update cell0 mappings + run_once: true delegate_to: "{{ groups[nova_api.group][0] }}" block: - name: Create cell0 mappings @@ -23,7 +24,8 @@ - map_cell0 is success - '"Cell0 is already setup" not in map_cell0.stdout' - - import_role: + - name: Import role for nova-cell + import_role: name: nova-cell tasks_from: get_cell_settings.yml vars: @@ -64,5 +66,6 @@ - nova_cell_settings | bool - nova_cell_settings.cell_database != nova_cell0_connection -- include_tasks: bootstrap_service.yml +- name: Include tasks from bootstrap_service.yml + include_tasks: bootstrap_service.yml when: map_cell0.changed # noqa no-handler diff --git a/ansible/roles/nova/tasks/precheck.yml b/ansible/roles/nova/tasks/precheck.yml index b2ac09312e..a86781e26f 100644 --- a/ansible/roles/nova/tasks/precheck.yml +++ b/ansible/roles/nova/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck nova configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ nova_services }}" diff --git a/ansible/roles/nova/tasks/pull.yml b/ansible/roles/nova/tasks/pull.yml index 53f9c5fda1..f1e5aeccfd 100644 --- a/ansible/roles/nova/tasks/pull.yml +++ b/ansible/roles/nova/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull nova images + import_role: role: service-images-pull diff --git a/ansible/roles/nova/tasks/reconfigure.yml b/ansible/roles/nova/tasks/reconfigure.yml index 5b10a7e111..cdbebc713d 100644 --- a/ansible/roles/nova/tasks/reconfigure.yml +++ b/ansible/roles/nova/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy nova + import_tasks: deploy.yml diff --git a/ansible/roles/nova/tasks/register.yml b/ansible/roles/nova/tasks/register.yml index c902fec305..998b3520db 100644 --- a/ansible/roles/nova/tasks/register.yml +++ b/ansible/roles/nova/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register nova service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_nova_auth }}" diff --git a/ansible/roles/nova/tasks/stop.yml b/ansible/roles/nova/tasks/stop.yml index 3cee9118ee..141f12fc84 100644 --- a/ansible/roles/nova/tasks/stop.yml +++ b/ansible/roles/nova/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop nova containers + import_role: name: service-stop vars: project_services: "{{ nova_services }}" diff --git a/ansible/roles/nova/tasks/upgrade.yml b/ansible/roles/nova/tasks/upgrade.yml index 005959c271..692add22ec 100644 --- a/ansible/roles/nova/tasks/upgrade.yml +++ b/ansible/roles/nova/tasks/upgrade.yml @@ -1,6 +1,7 @@ --- # Create new set of configs on nodes -- import_tasks: config.yml +- name: Configure nova + import_tasks: config.yml - name: Run Nova upgrade checks become: true @@ -44,7 +45,8 @@ when: - nova_safety_upgrade | bool -- import_tasks: check-containers.yml +- name: Check nova containers + import_tasks: check-containers.yml # TODO(donghm): Flush_handlers to restart nova services # should be run in serial nodes to decrease downtime if diff --git a/ansible/roles/octavia-certificates/tasks/main.yml b/ansible/roles/octavia-certificates/tasks/main.yml index b15a591f86..370bf5023e 100644 --- a/ansible/roles/octavia-certificates/tasks/main.yml +++ b/ansible/roles/octavia-certificates/tasks/main.yml @@ -11,7 +11,8 @@ include_tasks: check_expiry.yml when: octavia_certs_check_expiry | bool -- when: not octavia_certs_check_expiry | bool +- name: Generate Octavia certificates + when: not octavia_certs_check_expiry | bool block: - name: Ensure server_ca and client_ca directories exist file: @@ -28,11 +29,14 @@ dest: "{{ octavia_certs_work_dir }}/openssl.cnf" mode: "0600" - - import_tasks: server_ca.yml + - name: Import tasks from server_ca.yml + import_tasks: server_ca.yml - - import_tasks: client_ca.yml + - name: Import tasks from client_ca.yml + import_tasks: client_ca.yml - - import_tasks: client_cert.yml + - name: Import tasks from client_cert.yml + import_tasks: client_cert.yml - name: Ensure octavia directory exists under {{ node_custom_config }} file: diff --git a/ansible/roles/octavia/tasks/bootstrap.yml b/ansible/roles/octavia/tasks/bootstrap.yml index e51746de5a..5a295f4375 100644 --- a/ansible/roles/octavia/tasks/bootstrap.yml +++ b/ansible/roles/octavia/tasks/bootstrap.yml @@ -75,4 +75,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run octavia bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/octavia/tasks/check-containers.yml b/ansible/roles/octavia/tasks/check-containers.yml index b7e2f7c29f..f9aca28515 100644 --- a/ansible/roles/octavia/tasks/check-containers.yml +++ b/ansible/roles/octavia/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check octavia containers + import_role: name: service-check-containers diff --git a/ansible/roles/octavia/tasks/config-host.yml b/ansible/roles/octavia/tasks/config-host.yml index e74f711340..b45128b69b 100644 --- a/ansible/roles/octavia/tasks/config-host.yml +++ b/ansible/roles/octavia/tasks/config-host.yml @@ -1,5 +1,6 @@ --- -- include_tasks: hm-interface.yml +- name: Include tasks from hm-interface.yml + include_tasks: hm-interface.yml when: - octavia_auto_configure | bool - octavia_network_type == "tenant" diff --git a/ansible/roles/octavia/tasks/config.yml b/ansible/roles/octavia/tasks/config.yml index 774203e59a..2144c0fa59 100644 --- a/ansible/roles/octavia/tasks/config.yml +++ b/ansible/roles/octavia/tasks/config.yml @@ -1,5 +1,6 @@ --- -- include_tasks: get_resources_info.yml +- name: Include tasks from get_resources_info.yml + include_tasks: get_resources_info.yml when: octavia_auto_configure | bool - name: Ensuring config directories exist @@ -41,7 +42,8 @@ - octavia_policy_file is defined with_dict: "{{ octavia_services | select_services_enabled_and_mapped_to_host }}" -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - octavia_copy_certs | bool @@ -102,7 +104,8 @@ become: true with_dict: "{{ octavia_services | select_services_enabled_and_mapped_to_host }}" -- when: "'amphora' in octavia_provider_drivers" +- name: Copy Amphora SSH key and certificates + when: "'amphora' in octavia_provider_drivers" vars: octavia_amphora_keys: - client.cert-and-key.pem diff --git a/ansible/roles/octavia/tasks/config_validate.yml b/ansible/roles/octavia/tasks/config_validate.yml index e9069eb7ec..3d84cfc565 100644 --- a/ansible/roles/octavia/tasks/config_validate.yml +++ b/ansible/roles/octavia/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate octavia configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ octavia_services }}" diff --git a/ansible/roles/octavia/tasks/deploy-containers.yml b/ansible/roles/octavia/tasks/deploy-containers.yml index eb24ab5c7a..20bb9773c3 100644 --- a/ansible/roles/octavia/tasks/deploy-containers.yml +++ b/ansible/roles/octavia/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check octavia containers + import_tasks: check-containers.yml diff --git a/ansible/roles/octavia/tasks/deploy.yml b/ansible/roles/octavia/tasks/deploy.yml index b449b1483c..7d37eefe79 100644 --- a/ansible/roles/octavia/tasks/deploy.yml +++ b/ansible/roles/octavia/tasks/deploy.yml @@ -1,19 +1,26 @@ --- -- import_tasks: register.yml +- name: Register octavia in Keystone + import_tasks: register.yml -- include_tasks: prepare.yml +- name: Include tasks from prepare.yml + include_tasks: prepare.yml when: octavia_auto_configure | bool -- import_tasks: config-host.yml +- name: Import tasks from config-host.yml + import_tasks: config-host.yml -- import_tasks: config.yml +- name: Configure octavia + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check octavia containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone octavia repository + include_tasks: clone.yml when: octavia_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap octavia service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/octavia/tasks/main.yml b/ansible/roles/octavia/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/octavia/tasks/main.yml +++ b/ansible/roles/octavia/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/octavia/tasks/precheck.yml b/ansible/roles/octavia/tasks/precheck.yml index 6dbe9aef51..8cf60cb4b2 100644 --- a/ansible/roles/octavia/tasks/precheck.yml +++ b/ansible/roles/octavia/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck octavia configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ octavia_services }}" diff --git a/ansible/roles/octavia/tasks/pull.yml b/ansible/roles/octavia/tasks/pull.yml index 53f9c5fda1..f7889bb9db 100644 --- a/ansible/roles/octavia/tasks/pull.yml +++ b/ansible/roles/octavia/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull octavia images + import_role: role: service-images-pull diff --git a/ansible/roles/octavia/tasks/reconfigure.yml b/ansible/roles/octavia/tasks/reconfigure.yml index 5b10a7e111..44c7036d2d 100644 --- a/ansible/roles/octavia/tasks/reconfigure.yml +++ b/ansible/roles/octavia/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy octavia + import_tasks: deploy.yml diff --git a/ansible/roles/octavia/tasks/register.yml b/ansible/roles/octavia/tasks/register.yml index c01154c24a..73fa0be2a9 100644 --- a/ansible/roles/octavia/tasks/register.yml +++ b/ansible/roles/octavia/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register octavia service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_octavia_auth }}" diff --git a/ansible/roles/octavia/tasks/stop.yml b/ansible/roles/octavia/tasks/stop.yml index 1e4aefe241..67a39eef68 100644 --- a/ansible/roles/octavia/tasks/stop.yml +++ b/ansible/roles/octavia/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop octavia containers + import_role: name: service-stop vars: project_services: "{{ octavia_services }}" diff --git a/ansible/roles/octavia/tasks/upgrade.yml b/ansible/roles/octavia/tasks/upgrade.yml index 6ba9f99799..6c3676efe2 100644 --- a/ansible/roles/octavia/tasks/upgrade.yml +++ b/ansible/roles/octavia/tasks/upgrade.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure octavia + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check octavia containers + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Run octavia bootstrap container + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/opensearch/tasks/check-containers.yml b/ansible/roles/opensearch/tasks/check-containers.yml index b7e2f7c29f..4659180210 100644 --- a/ansible/roles/opensearch/tasks/check-containers.yml +++ b/ansible/roles/opensearch/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check opensearch containers + import_role: name: service-check-containers diff --git a/ansible/roles/opensearch/tasks/config.yml b/ansible/roles/opensearch/tasks/config.yml index 1e20070b42..0407f083cf 100644 --- a/ansible/roles/opensearch/tasks/config.yml +++ b/ansible/roles/opensearch/tasks/config.yml @@ -9,7 +9,8 @@ become: true with_dict: "{{ opensearch_services | select_services_enabled_and_mapped_to_host }}" -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - opensearch_copy_certs | bool diff --git a/ansible/roles/opensearch/tasks/deploy-containers.yml b/ansible/roles/opensearch/tasks/deploy-containers.yml index eb24ab5c7a..f2ee741a6b 100644 --- a/ansible/roles/opensearch/tasks/deploy-containers.yml +++ b/ansible/roles/opensearch/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check opensearch containers + import_tasks: check-containers.yml diff --git a/ansible/roles/opensearch/tasks/deploy.yml b/ansible/roles/opensearch/tasks/deploy.yml index a0ebfaf7d7..5ddc5b54b3 100644 --- a/ansible/roles/opensearch/tasks/deploy.yml +++ b/ansible/roles/opensearch/tasks/deploy.yml @@ -1,15 +1,20 @@ --- -- import_tasks: config-host.yml +- name: Import tasks from config-host.yml + import_tasks: config-host.yml -- import_tasks: config.yml +- name: Configure opensearch + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check opensearch containers + import_tasks: check-containers.yml -- include_tasks: register.yml +- name: Include tasks from register.yml + include_tasks: register.yml when: opensearch_enable_keystone_registration | bool - name: Flush handlers meta: flush_handlers -- include_tasks: post-config.yml +- name: Include tasks from post-config.yml + include_tasks: post-config.yml when: opensearch_apply_log_retention_policy | bool diff --git a/ansible/roles/opensearch/tasks/main.yml b/ansible/roles/opensearch/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/opensearch/tasks/main.yml +++ b/ansible/roles/opensearch/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/opensearch/tasks/post-config.yml b/ansible/roles/opensearch/tasks/post-config.yml index 27e0271eb1..f35b36f781 100644 --- a/ansible/roles/opensearch/tasks/post-config.yml +++ b/ansible/roles/opensearch/tasks/post-config.yml @@ -15,6 +15,21 @@ run_once: true when: not ansible_check_mode +- name: Wait for OpenSearch cluster to become healthy + become: true + kolla_toolbox: + container_engine: "{{ kolla_container_engine }}" + module_name: uri + module_args: + url: "{{ opensearch_internal_endpoint }}/_cluster/health" + ca_path: "{{ openstack_cacert }}" + register: opensearch_result + until: opensearch_result.json.status != "red" + retries: 30 + delay: 2 + run_once: true + when: not ansible_check_mode + - name: Check if a log retention policy exists become: true kolla_toolbox: diff --git a/ansible/roles/opensearch/tasks/precheck.yml b/ansible/roles/opensearch/tasks/precheck.yml index daceb7b4c1..99085f3c61 100644 --- a/ansible/roles/opensearch/tasks/precheck.yml +++ b/ansible/roles/opensearch/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck opensearch configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ opensearch_services }}" diff --git a/ansible/roles/opensearch/tasks/pull.yml b/ansible/roles/opensearch/tasks/pull.yml index 53f9c5fda1..e89d801791 100644 --- a/ansible/roles/opensearch/tasks/pull.yml +++ b/ansible/roles/opensearch/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull opensearch images + import_role: role: service-images-pull diff --git a/ansible/roles/opensearch/tasks/reconfigure.yml b/ansible/roles/opensearch/tasks/reconfigure.yml index 5b10a7e111..265122ffe9 100644 --- a/ansible/roles/opensearch/tasks/reconfigure.yml +++ b/ansible/roles/opensearch/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy opensearch + import_tasks: deploy.yml diff --git a/ansible/roles/opensearch/tasks/register.yml b/ansible/roles/opensearch/tasks/register.yml index 1fcb8be39b..ca5d6ed087 100644 --- a/ansible/roles/opensearch/tasks/register.yml +++ b/ansible/roles/opensearch/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register opensearch service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ opensearch_openstack_auth }}" diff --git a/ansible/roles/opensearch/tasks/stop.yml b/ansible/roles/opensearch/tasks/stop.yml index 8a9d328909..f8d81e2514 100644 --- a/ansible/roles/opensearch/tasks/stop.yml +++ b/ansible/roles/opensearch/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop opensearch containers + import_role: name: service-stop vars: project_services: "{{ opensearch_services }}" diff --git a/ansible/roles/opensearch/tasks/upgrade.yml b/ansible/roles/opensearch/tasks/upgrade.yml index cb376892a9..04c77d11c6 100644 --- a/ansible/roles/opensearch/tasks/upgrade.yml +++ b/ansible/roles/opensearch/tasks/upgrade.yml @@ -1,16 +1,21 @@ --- -- import_tasks: config-host.yml +- name: Import tasks from config-host.yml + import_tasks: config-host.yml -- import_tasks: config.yml +- name: Configure opensearch + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check opensearch containers + import_tasks: check-containers.yml -- include_tasks: register.yml +- name: Include tasks from register.yml + include_tasks: register.yml when: - opensearch_enable_keystone_registration | bool - name: Flush handlers meta: flush_handlers -- include_tasks: post-config.yml +- name: Include tasks from post-config.yml + include_tasks: post-config.yml when: opensearch_apply_log_retention_policy | bool diff --git a/ansible/roles/openvswitch/tasks/check-containers.yml b/ansible/roles/openvswitch/tasks/check-containers.yml index b7e2f7c29f..025a54c2c6 100644 --- a/ansible/roles/openvswitch/tasks/check-containers.yml +++ b/ansible/roles/openvswitch/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check openvswitch containers + import_role: name: service-check-containers diff --git a/ansible/roles/openvswitch/tasks/deploy-containers.yml b/ansible/roles/openvswitch/tasks/deploy-containers.yml index eb24ab5c7a..1467d31230 100644 --- a/ansible/roles/openvswitch/tasks/deploy-containers.yml +++ b/ansible/roles/openvswitch/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check openvswitch containers + import_tasks: check-containers.yml diff --git a/ansible/roles/openvswitch/tasks/deploy.yml b/ansible/roles/openvswitch/tasks/deploy.yml index 5db44393cb..b6f4138422 100644 --- a/ansible/roles/openvswitch/tasks/deploy.yml +++ b/ansible/roles/openvswitch/tasks/deploy.yml @@ -1,11 +1,15 @@ --- -- import_tasks: config-host.yml +- name: Import tasks from config-host.yml + import_tasks: config-host.yml -- import_tasks: config.yml +- name: Configure openvswitch + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check openvswitch containers + import_tasks: check-containers.yml - name: Flush Handlers meta: flush_handlers -- import_tasks: post-config.yml +- name: Import tasks from post-config.yml + import_tasks: post-config.yml diff --git a/ansible/roles/openvswitch/tasks/main.yml b/ansible/roles/openvswitch/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/openvswitch/tasks/main.yml +++ b/ansible/roles/openvswitch/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/openvswitch/tasks/precheck.yml b/ansible/roles/openvswitch/tasks/precheck.yml index a5717078b2..883d0a0011 100644 --- a/ansible/roles/openvswitch/tasks/precheck.yml +++ b/ansible/roles/openvswitch/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck openvswitch configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ openvswitch_services }}" diff --git a/ansible/roles/openvswitch/tasks/pull.yml b/ansible/roles/openvswitch/tasks/pull.yml index 53f9c5fda1..54f9d3a60e 100644 --- a/ansible/roles/openvswitch/tasks/pull.yml +++ b/ansible/roles/openvswitch/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull openvswitch images + import_role: role: service-images-pull diff --git a/ansible/roles/openvswitch/tasks/reconfigure.yml b/ansible/roles/openvswitch/tasks/reconfigure.yml index 5b10a7e111..5c5e68b299 100644 --- a/ansible/roles/openvswitch/tasks/reconfigure.yml +++ b/ansible/roles/openvswitch/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy openvswitch + import_tasks: deploy.yml diff --git a/ansible/roles/openvswitch/tasks/stop.yml b/ansible/roles/openvswitch/tasks/stop.yml index b0ecb2facb..420541104e 100644 --- a/ansible/roles/openvswitch/tasks/stop.yml +++ b/ansible/roles/openvswitch/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop openvswitch containers + import_role: name: service-stop vars: project_services: "{{ openvswitch_services }}" diff --git a/ansible/roles/openvswitch/tasks/upgrade.yml b/ansible/roles/openvswitch/tasks/upgrade.yml index 5db44393cb..b6f4138422 100644 --- a/ansible/roles/openvswitch/tasks/upgrade.yml +++ b/ansible/roles/openvswitch/tasks/upgrade.yml @@ -1,11 +1,15 @@ --- -- import_tasks: config-host.yml +- name: Import tasks from config-host.yml + import_tasks: config-host.yml -- import_tasks: config.yml +- name: Configure openvswitch + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check openvswitch containers + import_tasks: check-containers.yml - name: Flush Handlers meta: flush_handlers -- import_tasks: post-config.yml +- name: Import tasks from post-config.yml + import_tasks: post-config.yml diff --git a/ansible/roles/ovn-controller/tasks/check-containers.yml b/ansible/roles/ovn-controller/tasks/check-containers.yml index b7e2f7c29f..a93bbe3e30 100644 --- a/ansible/roles/ovn-controller/tasks/check-containers.yml +++ b/ansible/roles/ovn-controller/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check ovn-controller containers + import_role: name: service-check-containers diff --git a/ansible/roles/ovn-controller/tasks/deploy-containers.yml b/ansible/roles/ovn-controller/tasks/deploy-containers.yml index eb24ab5c7a..ccc1c169c0 100644 --- a/ansible/roles/ovn-controller/tasks/deploy-containers.yml +++ b/ansible/roles/ovn-controller/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check ovn-controller containers + import_tasks: check-containers.yml diff --git a/ansible/roles/ovn-controller/tasks/deploy.yml b/ansible/roles/ovn-controller/tasks/deploy.yml index 52482569d5..483a3f1f91 100644 --- a/ansible/roles/ovn-controller/tasks/deploy.yml +++ b/ansible/roles/ovn-controller/tasks/deploy.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure ovn-controller + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check ovn-controller containers + import_tasks: check-containers.yml -- import_tasks: setup-ovs.yml +- name: Import tasks from setup-ovs.yml + import_tasks: setup-ovs.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/ovn-controller/tasks/main.yml b/ansible/roles/ovn-controller/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/ovn-controller/tasks/main.yml +++ b/ansible/roles/ovn-controller/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/ovn-controller/tasks/pull.yml b/ansible/roles/ovn-controller/tasks/pull.yml index 53f9c5fda1..7478b6a058 100644 --- a/ansible/roles/ovn-controller/tasks/pull.yml +++ b/ansible/roles/ovn-controller/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull ovn-controller images + import_role: role: service-images-pull diff --git a/ansible/roles/ovn-controller/tasks/reconfigure.yml b/ansible/roles/ovn-controller/tasks/reconfigure.yml index 5b10a7e111..fd90b02cae 100644 --- a/ansible/roles/ovn-controller/tasks/reconfigure.yml +++ b/ansible/roles/ovn-controller/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy ovn-controller + import_tasks: deploy.yml diff --git a/ansible/roles/ovn-controller/tasks/stop.yml b/ansible/roles/ovn-controller/tasks/stop.yml index 25f85ac67d..52aef1493e 100644 --- a/ansible/roles/ovn-controller/tasks/stop.yml +++ b/ansible/roles/ovn-controller/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop ovn-controller services + import_role: role: service-stop vars: project_services: "{{ ovn_controller_services }}" diff --git a/ansible/roles/ovn-controller/tasks/upgrade.yml b/ansible/roles/ovn-controller/tasks/upgrade.yml index 5b10a7e111..bdcead398a 100644 --- a/ansible/roles/ovn-controller/tasks/upgrade.yml +++ b/ansible/roles/ovn-controller/tasks/upgrade.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Import tasks from deploy.yml + import_tasks: deploy.yml diff --git a/ansible/roles/ovn-db/tasks/bootstrap-initial.yml b/ansible/roles/ovn-db/tasks/bootstrap-initial.yml index be4af702e7..7e8976f074 100644 --- a/ansible/roles/ovn-db/tasks/bootstrap-initial.yml +++ b/ansible/roles/ovn-db/tasks/bootstrap-initial.yml @@ -68,14 +68,17 @@ ovn_sb_db_bootstrap_args: "--db-sb-cluster-remote-addr={{ 'api' | kolla_address(groups.get('ovn-sb-db_leader', groups['ovn-sb-db'])[0] | default()) | put_address_in_context('url') }}" when: inventory_hostname in groups.get('ovn-sb-db_had_volume_False', '') and groups['ovn-sb-db_leader'] is defined - - import_tasks: config.yml + - name: Import tasks from config.yml + import_tasks: config.yml - - import_tasks: check-containers.yml + - name: Import tasks from check-containers.yml + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers - - import_tasks: bootstrap-db.yml + - name: Import tasks from bootstrap-db.yml + import_tasks: bootstrap-db.yml - name: Unset bootstrap args fact set_fact: diff --git a/ansible/roles/ovn-db/tasks/check-containers.yml b/ansible/roles/ovn-db/tasks/check-containers.yml index b7e2f7c29f..d475fceeea 100644 --- a/ansible/roles/ovn-db/tasks/check-containers.yml +++ b/ansible/roles/ovn-db/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check ovn-db containers + import_role: name: service-check-containers diff --git a/ansible/roles/ovn-db/tasks/deploy-containers.yml b/ansible/roles/ovn-db/tasks/deploy-containers.yml index eb24ab5c7a..f4fbf462ae 100644 --- a/ansible/roles/ovn-db/tasks/deploy-containers.yml +++ b/ansible/roles/ovn-db/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check ovn-db containers + import_tasks: check-containers.yml diff --git a/ansible/roles/ovn-db/tasks/deploy.yml b/ansible/roles/ovn-db/tasks/deploy.yml index d92bb7b614..d73ed47c8e 100644 --- a/ansible/roles/ovn-db/tasks/deploy.yml +++ b/ansible/roles/ovn-db/tasks/deploy.yml @@ -1,22 +1,27 @@ --- -- include_tasks: lookup_cluster.yml +- name: Include tasks from lookup_cluster.yml + include_tasks: lookup_cluster.yml when: - inventory_hostname in groups['ovn-nb-db'] or inventory_hostname in groups['ovn-sb-db'] -- include_tasks: bootstrap-initial.yml +- name: Include tasks from bootstrap-initial.yml + include_tasks: bootstrap-initial.yml when: - inventory_hostname in groups.get('ovn-nb-db_had_volume_False', '') or inventory_hostname in groups.get('ovn-sb-db_had_volume_False', '') -- import_tasks: config.yml +- name: Configure ovn-db + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check ovn-db containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers -- import_tasks: bootstrap-db.yml +- name: Import tasks from bootstrap-db.yml + import_tasks: bootstrap-db.yml when: - inventory_hostname in groups['ovn-nb-db'] - inventory_hostname in groups['ovn-sb-db'] diff --git a/ansible/roles/ovn-db/tasks/main.yml b/ansible/roles/ovn-db/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/ovn-db/tasks/main.yml +++ b/ansible/roles/ovn-db/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/ovn-db/tasks/pull.yml b/ansible/roles/ovn-db/tasks/pull.yml index 53f9c5fda1..733ba0190d 100644 --- a/ansible/roles/ovn-db/tasks/pull.yml +++ b/ansible/roles/ovn-db/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull ovn-db images + import_role: role: service-images-pull diff --git a/ansible/roles/ovn-db/tasks/reconfigure.yml b/ansible/roles/ovn-db/tasks/reconfigure.yml index 5b10a7e111..1b6300c2b6 100644 --- a/ansible/roles/ovn-db/tasks/reconfigure.yml +++ b/ansible/roles/ovn-db/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy ovn-db + import_tasks: deploy.yml diff --git a/ansible/roles/ovn-db/tasks/stop.yml b/ansible/roles/ovn-db/tasks/stop.yml index eadbf02a80..b5cdb87688 100644 --- a/ansible/roles/ovn-db/tasks/stop.yml +++ b/ansible/roles/ovn-db/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop ovn-db services + import_role: role: service-stop vars: project_services: "{{ ovn_db_services }}" diff --git a/ansible/roles/ovn-db/tasks/upgrade.yml b/ansible/roles/ovn-db/tasks/upgrade.yml index 5b10a7e111..bdcead398a 100644 --- a/ansible/roles/ovn-db/tasks/upgrade.yml +++ b/ansible/roles/ovn-db/tasks/upgrade.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Import tasks from deploy.yml + import_tasks: deploy.yml diff --git a/ansible/roles/ovs-dpdk/tasks/check-containers.yml b/ansible/roles/ovs-dpdk/tasks/check-containers.yml index b7e2f7c29f..f1dfaadeb5 100644 --- a/ansible/roles/ovs-dpdk/tasks/check-containers.yml +++ b/ansible/roles/ovs-dpdk/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check ovs-dpdk containers + import_role: name: service-check-containers diff --git a/ansible/roles/ovs-dpdk/tasks/deploy-containers.yml b/ansible/roles/ovs-dpdk/tasks/deploy-containers.yml index eb24ab5c7a..3d57cd7134 100644 --- a/ansible/roles/ovs-dpdk/tasks/deploy-containers.yml +++ b/ansible/roles/ovs-dpdk/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check ovs-dpdk containers + import_tasks: check-containers.yml diff --git a/ansible/roles/ovs-dpdk/tasks/deploy.yml b/ansible/roles/ovs-dpdk/tasks/deploy.yml index 682ed3e300..f05ed447fb 100644 --- a/ansible/roles/ovs-dpdk/tasks/deploy.yml +++ b/ansible/roles/ovs-dpdk/tasks/deploy.yml @@ -1,7 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure ovs-dpdk + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check ovs-dpdk containers + import_tasks: check-containers.yml - name: Flush Handlers meta: flush_handlers diff --git a/ansible/roles/ovs-dpdk/tasks/main.yml b/ansible/roles/ovs-dpdk/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/ovs-dpdk/tasks/main.yml +++ b/ansible/roles/ovs-dpdk/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/ovs-dpdk/tasks/precheck.yml b/ansible/roles/ovs-dpdk/tasks/precheck.yml index 7ac334b197..81f47a79da 100644 --- a/ansible/roles/ovs-dpdk/tasks/precheck.yml +++ b/ansible/roles/ovs-dpdk/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck ovs-dpdk configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ ovsdpdk_services }}" diff --git a/ansible/roles/ovs-dpdk/tasks/pull.yml b/ansible/roles/ovs-dpdk/tasks/pull.yml index 53f9c5fda1..bf0670e4b6 100644 --- a/ansible/roles/ovs-dpdk/tasks/pull.yml +++ b/ansible/roles/ovs-dpdk/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull ovs-dpdk images + import_role: role: service-images-pull diff --git a/ansible/roles/ovs-dpdk/tasks/reconfigure.yml b/ansible/roles/ovs-dpdk/tasks/reconfigure.yml index 5b10a7e111..9129a64f7f 100644 --- a/ansible/roles/ovs-dpdk/tasks/reconfigure.yml +++ b/ansible/roles/ovs-dpdk/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy ovs-dpdk + import_tasks: deploy.yml diff --git a/ansible/roles/ovs-dpdk/tasks/stop.yml b/ansible/roles/ovs-dpdk/tasks/stop.yml index 71fda73ac9..d81e25b81f 100644 --- a/ansible/roles/ovs-dpdk/tasks/stop.yml +++ b/ansible/roles/ovs-dpdk/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop ovs-dpdk containers + import_role: name: service-stop vars: project_services: "{{ ovsdpdk_services }}" diff --git a/ansible/roles/ovs-dpdk/tasks/upgrade.yml b/ansible/roles/ovs-dpdk/tasks/upgrade.yml index 5b10a7e111..bdcead398a 100644 --- a/ansible/roles/ovs-dpdk/tasks/upgrade.yml +++ b/ansible/roles/ovs-dpdk/tasks/upgrade.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Import tasks from deploy.yml + import_tasks: deploy.yml diff --git a/ansible/roles/placement/tasks/bootstrap.yml b/ansible/roles/placement/tasks/bootstrap.yml index 109dd307ab..a4fa396704 100644 --- a/ansible/roles/placement/tasks/bootstrap.yml +++ b/ansible/roles/placement/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run placement bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/placement/tasks/check-containers.yml b/ansible/roles/placement/tasks/check-containers.yml index b7e2f7c29f..d7e7ecb30a 100644 --- a/ansible/roles/placement/tasks/check-containers.yml +++ b/ansible/roles/placement/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check placement containers + import_role: name: service-check-containers diff --git a/ansible/roles/placement/tasks/config.yml b/ansible/roles/placement/tasks/config.yml index 585f78693d..b9cd45b87e 100644 --- a/ansible/roles/placement/tasks/config.yml +++ b/ansible/roles/placement/tasks/config.yml @@ -28,7 +28,8 @@ when: - placement_policy.results | length > 0 -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - placement_copy_certs | bool diff --git a/ansible/roles/placement/tasks/config_validate.yml b/ansible/roles/placement/tasks/config_validate.yml index 9411eb44a4..d968868224 100644 --- a/ansible/roles/placement/tasks/config_validate.yml +++ b/ansible/roles/placement/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate placement configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ placement_services }}" diff --git a/ansible/roles/placement/tasks/deploy-containers.yml b/ansible/roles/placement/tasks/deploy-containers.yml index eb24ab5c7a..896c8b1b32 100644 --- a/ansible/roles/placement/tasks/deploy-containers.yml +++ b/ansible/roles/placement/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check placement containers + import_tasks: check-containers.yml diff --git a/ansible/roles/placement/tasks/deploy.yml b/ansible/roles/placement/tasks/deploy.yml index 504031a3c2..10dd4e03cc 100644 --- a/ansible/roles/placement/tasks/deploy.yml +++ b/ansible/roles/placement/tasks/deploy.yml @@ -1,14 +1,19 @@ --- -- import_tasks: register.yml +- name: Register placement in Keystone + import_tasks: register.yml -- include_tasks: clone.yml +- name: Clone placement repository + include_tasks: clone.yml when: placement_dev_mode | bool -- import_tasks: config.yml +- name: Configure placement + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check placement containers + import_tasks: check-containers.yml -- import_tasks: bootstrap.yml +- name: Bootstrap placement service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/placement/tasks/main.yml b/ansible/roles/placement/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/placement/tasks/main.yml +++ b/ansible/roles/placement/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/placement/tasks/precheck.yml b/ansible/roles/placement/tasks/precheck.yml index a91bac3ef9..bc0368c7fa 100644 --- a/ansible/roles/placement/tasks/precheck.yml +++ b/ansible/roles/placement/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck placement configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ placement_services }}" diff --git a/ansible/roles/placement/tasks/pull.yml b/ansible/roles/placement/tasks/pull.yml index 53f9c5fda1..f3938d8da1 100644 --- a/ansible/roles/placement/tasks/pull.yml +++ b/ansible/roles/placement/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull placement images + import_role: role: service-images-pull diff --git a/ansible/roles/placement/tasks/reconfigure.yml b/ansible/roles/placement/tasks/reconfigure.yml index 5b10a7e111..91cc6e6977 100644 --- a/ansible/roles/placement/tasks/reconfigure.yml +++ b/ansible/roles/placement/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy placement + import_tasks: deploy.yml diff --git a/ansible/roles/placement/tasks/register.yml b/ansible/roles/placement/tasks/register.yml index 76db452abd..40bbc88d8f 100644 --- a/ansible/roles/placement/tasks/register.yml +++ b/ansible/roles/placement/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register placement service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_placement_auth }}" diff --git a/ansible/roles/placement/tasks/stop.yml b/ansible/roles/placement/tasks/stop.yml index 03da58a450..5dfd0db290 100644 --- a/ansible/roles/placement/tasks/stop.yml +++ b/ansible/roles/placement/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop placement containers + import_role: name: service-stop vars: project_services: "{{ placement_services }}" diff --git a/ansible/roles/placement/tasks/upgrade.yml b/ansible/roles/placement/tasks/upgrade.yml index ee01b0d93d..0fe6b7c700 100644 --- a/ansible/roles/placement/tasks/upgrade.yml +++ b/ansible/roles/placement/tasks/upgrade.yml @@ -1,14 +1,19 @@ --- -- import_tasks: register.yml +- name: Import tasks from register.yml + import_tasks: register.yml -- include_tasks: clone.yml +- name: Include tasks from clone.yml + include_tasks: clone.yml when: placement_dev_mode | bool -- import_tasks: config.yml +- name: Configure placement + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check placement containers + import_tasks: check-containers.yml -- import_tasks: bootstrap.yml +- name: Import tasks from bootstrap.yml + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/prechecks/tasks/datetime_checks.yml b/ansible/roles/prechecks/tasks/datetime_checks.yml index 939d7d113e..2767bdfe0c 100644 --- a/ansible/roles/prechecks/tasks/datetime_checks.yml +++ b/ansible/roles/prechecks/tasks/datetime_checks.yml @@ -11,7 +11,8 @@ settings and Kolla Ansible needs this file for mounting it to containers. when: not etc_localtime.stat.exists -- when: ansible_facts.os_family == 'Debian' +- name: Check Debian timezone configuration + when: ansible_facts.os_family == 'Debian' block: - name: Ensure /etc/timezone exist stat: diff --git a/ansible/roles/prechecks/tasks/main.yml b/ansible/roles/prechecks/tasks/main.yml index 01bf0e16cd..16ce357fb6 100644 --- a/ansible/roles/prechecks/tasks/main.yml +++ b/ansible/roles/prechecks/tasks/main.yml @@ -1,23 +1,32 @@ --- -- import_tasks: inventory_checks.yml +- name: Import tasks from inventory_checks.yml + import_tasks: inventory_checks.yml -- include_tasks: host_os_checks.yml +- name: Include tasks from host_os_checks.yml + include_tasks: host_os_checks.yml when: prechecks_enable_host_os_checks | bool -- include_tasks: timesync_checks.yml +- name: Include tasks from timesync_checks.yml + include_tasks: timesync_checks.yml when: - inventory_hostname not in groups['deployment'] | default([]) -- import_tasks: datetime_checks.yml +- name: Import tasks from datetime_checks.yml + import_tasks: datetime_checks.yml -- include_tasks: port_checks.yml +- name: Include tasks from port_checks.yml + include_tasks: port_checks.yml when: - inventory_hostname not in groups['deployment'] | default([]) -- import_tasks: service_checks.yml +- name: Import tasks from service_checks.yml + import_tasks: service_checks.yml -- import_tasks: package_checks.yml +- name: Import tasks from package_checks.yml + import_tasks: package_checks.yml -- import_tasks: user_checks.yml +- name: Import tasks from user_checks.yml + import_tasks: user_checks.yml -- import_tasks: database_checks.yml +- name: Import tasks from database_checks.yml + import_tasks: database_checks.yml diff --git a/ansible/roles/prechecks/tasks/timesync_checks.yml b/ansible/roles/prechecks/tasks/timesync_checks.yml index e63563dadb..ffb9194f9e 100644 --- a/ansible/roles/prechecks/tasks/timesync_checks.yml +++ b/ansible/roles/prechecks/tasks/timesync_checks.yml @@ -1,5 +1,6 @@ --- -- when: prechecks_enable_host_ntp_checks | bool +- name: Check host NTP daemon status + when: prechecks_enable_host_ntp_checks | bool block: - name: Check for a running host NTP daemon # noqa command-instead-of-module vars: diff --git a/ansible/roles/prometheus-node-exporters/tasks/check-containers.yml b/ansible/roles/prometheus-node-exporters/tasks/check-containers.yml index b7e2f7c29f..479c96182b 100644 --- a/ansible/roles/prometheus-node-exporters/tasks/check-containers.yml +++ b/ansible/roles/prometheus-node-exporters/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check prometheus-node-exporters containers + import_role: name: service-check-containers diff --git a/ansible/roles/prometheus-node-exporters/tasks/config.yml b/ansible/roles/prometheus-node-exporters/tasks/config.yml index 83de189b2f..7915e7bd69 100644 --- a/ansible/roles/prometheus-node-exporters/tasks/config.yml +++ b/ansible/roles/prometheus-node-exporters/tasks/config.yml @@ -12,7 +12,8 @@ - item.value.enabled | bool with_dict: "{{ prometheus_services }}" -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - kolla_copy_ca_into_containers | bool diff --git a/ansible/roles/prometheus-node-exporters/tasks/deploy-containers.yml b/ansible/roles/prometheus-node-exporters/tasks/deploy-containers.yml index eb24ab5c7a..c3de744710 100644 --- a/ansible/roles/prometheus-node-exporters/tasks/deploy-containers.yml +++ b/ansible/roles/prometheus-node-exporters/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check prometheus-node-exporters containers + import_tasks: check-containers.yml diff --git a/ansible/roles/prometheus-node-exporters/tasks/deploy.yml b/ansible/roles/prometheus-node-exporters/tasks/deploy.yml index 49edff81e3..483ea0bbb8 100644 --- a/ansible/roles/prometheus-node-exporters/tasks/deploy.yml +++ b/ansible/roles/prometheus-node-exporters/tasks/deploy.yml @@ -1,7 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure prometheus-node-exporters + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check prometheus-node-exporters containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/prometheus-node-exporters/tasks/main.yml b/ansible/roles/prometheus-node-exporters/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/prometheus-node-exporters/tasks/main.yml +++ b/ansible/roles/prometheus-node-exporters/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/prometheus-node-exporters/tasks/precheck.yml b/ansible/roles/prometheus-node-exporters/tasks/precheck.yml index 87e56d7a4a..9c856decdf 100644 --- a/ansible/roles/prometheus-node-exporters/tasks/precheck.yml +++ b/ansible/roles/prometheus-node-exporters/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck prometheus-node-exporters configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ prometheus_services }}" diff --git a/ansible/roles/prometheus-node-exporters/tasks/pull.yml b/ansible/roles/prometheus-node-exporters/tasks/pull.yml index 53f9c5fda1..842788eddc 100644 --- a/ansible/roles/prometheus-node-exporters/tasks/pull.yml +++ b/ansible/roles/prometheus-node-exporters/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull prometheus-node-exporters images + import_role: role: service-images-pull diff --git a/ansible/roles/prometheus-node-exporters/tasks/reconfigure.yml b/ansible/roles/prometheus-node-exporters/tasks/reconfigure.yml index 5b10a7e111..cfe2e22153 100644 --- a/ansible/roles/prometheus-node-exporters/tasks/reconfigure.yml +++ b/ansible/roles/prometheus-node-exporters/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy prometheus-node-exporters + import_tasks: deploy.yml diff --git a/ansible/roles/prometheus-node-exporters/tasks/stop.yml b/ansible/roles/prometheus-node-exporters/tasks/stop.yml index 18d4f9bc58..a3854a5da8 100644 --- a/ansible/roles/prometheus-node-exporters/tasks/stop.yml +++ b/ansible/roles/prometheus-node-exporters/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop prometheus-node-exporters containers + import_role: name: service-stop vars: project_services: "{{ prometheus_services }}" diff --git a/ansible/roles/prometheus-node-exporters/tasks/upgrade.yml b/ansible/roles/prometheus-node-exporters/tasks/upgrade.yml index 49edff81e3..483ea0bbb8 100644 --- a/ansible/roles/prometheus-node-exporters/tasks/upgrade.yml +++ b/ansible/roles/prometheus-node-exporters/tasks/upgrade.yml @@ -1,7 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure prometheus-node-exporters + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check prometheus-node-exporters containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/prometheus/tasks/check-containers.yml b/ansible/roles/prometheus/tasks/check-containers.yml index b7e2f7c29f..b1aca322d8 100644 --- a/ansible/roles/prometheus/tasks/check-containers.yml +++ b/ansible/roles/prometheus/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check prometheus containers + import_role: name: service-check-containers diff --git a/ansible/roles/prometheus/tasks/config.yml b/ansible/roles/prometheus/tasks/config.yml index 1b98f40c81..df8b030bec 100644 --- a/ansible/roles/prometheus/tasks/config.yml +++ b/ansible/roles/prometheus/tasks/config.yml @@ -9,7 +9,8 @@ mode: "0770" with_dict: "{{ prometheus_services | select_services_enabled_and_mapped_to_host }}" -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - prometheus_copy_certs | bool @@ -175,7 +176,8 @@ - "{{ node_custom_config }}/prometheus/prometheus-blackbox-exporter.yml" - "{{ role_path }}/templates/prometheus-blackbox-exporter.yml.j2" -- vars: +- name: Copy extra prometheus server config files + vars: base: "{{ node_custom_config }}/prometheus/" service: "{{ prometheus_services['prometheus-server'] }}" when: service | service_enabled_and_mapped_to_host diff --git a/ansible/roles/prometheus/tasks/deploy-containers.yml b/ansible/roles/prometheus/tasks/deploy-containers.yml index eb24ab5c7a..b3c6462018 100644 --- a/ansible/roles/prometheus/tasks/deploy-containers.yml +++ b/ansible/roles/prometheus/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check prometheus containers + import_tasks: check-containers.yml diff --git a/ansible/roles/prometheus/tasks/deploy.yml b/ansible/roles/prometheus/tasks/deploy.yml index d0b36cb78b..2768f0434c 100644 --- a/ansible/roles/prometheus/tasks/deploy.yml +++ b/ansible/roles/prometheus/tasks/deploy.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure prometheus + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check prometheus containers + import_tasks: check-containers.yml -- import_tasks: bootstrap.yml +- name: Bootstrap prometheus service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/prometheus/tasks/main.yml b/ansible/roles/prometheus/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/prometheus/tasks/main.yml +++ b/ansible/roles/prometheus/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/prometheus/tasks/precheck.yml b/ansible/roles/prometheus/tasks/precheck.yml index e3b19ad11b..e7e1e8f615 100644 --- a/ansible/roles/prometheus/tasks/precheck.yml +++ b/ansible/roles/prometheus/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck prometheus configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ prometheus_services }}" diff --git a/ansible/roles/prometheus/tasks/pull.yml b/ansible/roles/prometheus/tasks/pull.yml index 53f9c5fda1..08a8ba307b 100644 --- a/ansible/roles/prometheus/tasks/pull.yml +++ b/ansible/roles/prometheus/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull prometheus images + import_role: role: service-images-pull diff --git a/ansible/roles/prometheus/tasks/reconfigure.yml b/ansible/roles/prometheus/tasks/reconfigure.yml index 5b10a7e111..5e11395790 100644 --- a/ansible/roles/prometheus/tasks/reconfigure.yml +++ b/ansible/roles/prometheus/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy prometheus + import_tasks: deploy.yml diff --git a/ansible/roles/prometheus/tasks/stop.yml b/ansible/roles/prometheus/tasks/stop.yml index 18d4f9bc58..f0a46f46b3 100644 --- a/ansible/roles/prometheus/tasks/stop.yml +++ b/ansible/roles/prometheus/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop prometheus containers + import_role: name: service-stop vars: project_services: "{{ prometheus_services }}" diff --git a/ansible/roles/prometheus/tasks/upgrade.yml b/ansible/roles/prometheus/tasks/upgrade.yml index f9c69c45d4..7d4fb6eb16 100644 --- a/ansible/roles/prometheus/tasks/upgrade.yml +++ b/ansible/roles/prometheus/tasks/upgrade.yml @@ -1,5 +1,6 @@ --- -- import_tasks: config.yml +- name: Configure prometheus + import_tasks: config.yml # NOTE(mnasiadka): Remove me in 2025.2 - name: Check for the existence of Prometheus v2 container volume @@ -39,7 +40,8 @@ name: "prometheus_v2" common_options: "{{ docker_common_options }}" -- import_tasks: check-containers.yml +- name: Check prometheus containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/prune-images/tasks/main.yml b/ansible/roles/prune-images/tasks/main.yml index 3d08385b93..a145964383 100644 --- a/ansible/roles/prune-images/tasks/main.yml +++ b/ansible/roles/prune-images/tasks/main.yml @@ -1,4 +1,6 @@ --- -- import_tasks: validate_docker_execute.yml +- name: Import tasks from validate_docker_execute.yml + import_tasks: validate_docker_execute.yml -- import_tasks: prune_images.yml +- name: Import tasks from prune_images.yml + import_tasks: prune_images.yml diff --git a/ansible/roles/rabbitmq/tasks/check-containers.yml b/ansible/roles/rabbitmq/tasks/check-containers.yml index b7e2f7c29f..7d3f9270a2 100644 --- a/ansible/roles/rabbitmq/tasks/check-containers.yml +++ b/ansible/roles/rabbitmq/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check rabbitmq containers + import_role: name: service-check-containers diff --git a/ansible/roles/rabbitmq/tasks/config.yml b/ansible/roles/rabbitmq/tasks/config.yml index c393d5ec04..af6dce3be5 100644 --- a/ansible/roles/rabbitmq/tasks/config.yml +++ b/ansible/roles/rabbitmq/tasks/config.yml @@ -101,6 +101,7 @@ - "enabled_plugins.j2" when: service | service_enabled_and_mapped_to_host -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - rabbitmq_copy_certs | bool diff --git a/ansible/roles/rabbitmq/tasks/deploy-containers.yml b/ansible/roles/rabbitmq/tasks/deploy-containers.yml index eb24ab5c7a..44aee4da04 100644 --- a/ansible/roles/rabbitmq/tasks/deploy-containers.yml +++ b/ansible/roles/rabbitmq/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check rabbitmq containers + import_tasks: check-containers.yml diff --git a/ansible/roles/rabbitmq/tasks/deploy.yml b/ansible/roles/rabbitmq/tasks/deploy.yml index 462b029f0d..40750d1711 100644 --- a/ansible/roles/rabbitmq/tasks/deploy.yml +++ b/ansible/roles/rabbitmq/tasks/deploy.yml @@ -1,10 +1,15 @@ --- -- import_tasks: version-check.yml +- name: Import tasks from version-check.yml + import_tasks: version-check.yml -- include_tasks: remove-ha-all-policy.yml +- name: Include tasks from remove-ha-all-policy.yml + include_tasks: remove-ha-all-policy.yml -- import_tasks: config.yml +- name: Configure rabbitmq + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check rabbitmq containers + import_tasks: check-containers.yml -- import_tasks: bootstrap.yml +- name: Bootstrap rabbitmq service + import_tasks: bootstrap.yml diff --git a/ansible/roles/rabbitmq/tasks/main.yml b/ansible/roles/rabbitmq/tasks/main.yml index 3e2e4f493e..a22f39066d 100644 --- a/ansible/roles/rabbitmq/tasks/main.yml +++ b/ansible/roles/rabbitmq/tasks/main.yml @@ -1,3 +1,4 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" when: inventory_hostname in groups[role_rabbitmq_groups] diff --git a/ansible/roles/rabbitmq/tasks/post-deploy.yml b/ansible/roles/rabbitmq/tasks/post-deploy.yml index 9c04d85c26..7ba2b10eb6 100644 --- a/ansible/roles/rabbitmq/tasks/post-deploy.yml +++ b/ansible/roles/rabbitmq/tasks/post-deploy.yml @@ -1,2 +1,3 @@ --- -- import_tasks: feature-flags.yml +- name: Import tasks from feature-flags.yml + import_tasks: feature-flags.yml diff --git a/ansible/roles/rabbitmq/tasks/precheck.yml b/ansible/roles/rabbitmq/tasks/precheck.yml index 240ccebb12..5e199abb13 100644 --- a/ansible/roles/rabbitmq/tasks/precheck.yml +++ b/ansible/roles/rabbitmq/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck rabbitmq configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ rabbitmq_services }}" @@ -105,7 +106,8 @@ - not kolla_externally_managed_cert | bool - rabbitmq_enable_tls | bool -- run_once: true +- name: Check RabbitMQ HA compatibility + run_once: true when: - container_facts.containers['rabbitmq'] is defined tags: rabbitmq-ha-precheck diff --git a/ansible/roles/rabbitmq/tasks/pull.yml b/ansible/roles/rabbitmq/tasks/pull.yml index 53f9c5fda1..292e3f9e08 100644 --- a/ansible/roles/rabbitmq/tasks/pull.yml +++ b/ansible/roles/rabbitmq/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull rabbitmq images + import_role: role: service-images-pull diff --git a/ansible/roles/rabbitmq/tasks/reconfigure.yml b/ansible/roles/rabbitmq/tasks/reconfigure.yml index 5b10a7e111..c3062385f4 100644 --- a/ansible/roles/rabbitmq/tasks/reconfigure.yml +++ b/ansible/roles/rabbitmq/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy rabbitmq + import_tasks: deploy.yml diff --git a/ansible/roles/rabbitmq/tasks/remove-ha-all-policy.yml b/ansible/roles/rabbitmq/tasks/remove-ha-all-policy.yml index acf7435e06..d3c895d69e 100644 --- a/ansible/roles/rabbitmq/tasks/remove-ha-all-policy.yml +++ b/ansible/roles/rabbitmq/tasks/remove-ha-all-policy.yml @@ -1,5 +1,6 @@ --- -- delegate_to: "{{ groups[role_rabbitmq_groups] | first }}" +- name: Remove RabbitMQ HA all policy + delegate_to: "{{ groups[role_rabbitmq_groups] | first }}" run_once: true vars: service_name: "rabbitmq" @@ -14,7 +15,8 @@ - "{{ service.container_name }}" register: container_facts - - when: container_facts.containers[service.container_name] is defined + - name: Remove RabbitMQ HA all policy + when: container_facts.containers[service.container_name] is defined block: - name: List RabbitMQ policies become: true diff --git a/ansible/roles/rabbitmq/tasks/stop.yml b/ansible/roles/rabbitmq/tasks/stop.yml index 1b6e3517b9..421c3e49cd 100644 --- a/ansible/roles/rabbitmq/tasks/stop.yml +++ b/ansible/roles/rabbitmq/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop rabbitmq containers + import_role: name: service-stop vars: project_services: "{{ rabbitmq_services }}" diff --git a/ansible/roles/rabbitmq/tasks/upgrade.yml b/ansible/roles/rabbitmq/tasks/upgrade.yml index 81a9e949b7..2ff4b5bf5c 100644 --- a/ansible/roles/rabbitmq/tasks/upgrade.yml +++ b/ansible/roles/rabbitmq/tasks/upgrade.yml @@ -1,10 +1,15 @@ --- -- import_tasks: version-check.yml +- name: Import tasks from version-check.yml + import_tasks: version-check.yml -- include_tasks: remove-ha-all-policy.yml +- name: Include tasks from remove-ha-all-policy.yml + include_tasks: remove-ha-all-policy.yml -- import_tasks: config.yml +- name: Configure rabbitmq + import_tasks: config.yml -- import_tasks: feature-flags.yml +- name: Import tasks from feature-flags.yml + import_tasks: feature-flags.yml -- import_tasks: check-containers.yml +- name: Check rabbitmq containers + import_tasks: check-containers.yml diff --git a/ansible/roles/rabbitmq/tasks/version-check.yml b/ansible/roles/rabbitmq/tasks/version-check.yml index daf1eb7dd1..884ca4f36a 100644 --- a/ansible/roles/rabbitmq/tasks/version-check.yml +++ b/ansible/roles/rabbitmq/tasks/version-check.yml @@ -1,5 +1,6 @@ --- -- delegate_to: "{{ groups[role_rabbitmq_groups] | first }}" +- name: Check RabbitMQ version compatibility + delegate_to: "{{ groups[role_rabbitmq_groups] | first }}" run_once: true tags: rabbitmq-version-check vars: @@ -15,7 +16,8 @@ - "{{ service.container_name }}" register: container_facts - - when: container_facts.containers[service.container_name] is defined + - name: Check RabbitMQ version upgrade compatibility + when: container_facts.containers[service.container_name] is defined block: - name: Get current RabbitMQ version become: true @@ -62,9 +64,9 @@ upgrade_version: "{{ '4.0 or 4.1' if current_version == '3.13' else current_version_major + '.' + (current_version_minor | int + 1) | string }}" assert: that: (current_version_major == new_version_major and - new_version_minor | int - current_version_minor | int <= 1) or - (new_version | float == 4.0 and current_version | float == 3.13) or - (new_version | float == 4.1 and current_version | float == 3.13) + new_version_minor | int - current_version_minor | int <= 1) or + (new_version | float == 4.0 and current_version | float == 3.13) or + (new_version | float == 4.1 and current_version | float == 3.13) fail_msg: > Looks like you're trying to run a skip-release upgrade! RabbitMQ must be at most one version behind the target release version ({{ rabbitmq_version_new.stdout | trim }}) to run this upgrade. diff --git a/ansible/roles/service-check-containers/tasks/main.yml b/ansible/roles/service-check-containers/tasks/main.yml index da6fce15bb..9e4c2e5324 100644 --- a/ansible/roles/service-check-containers/tasks/main.yml +++ b/ansible/roles/service-check-containers/tasks/main.yml @@ -40,7 +40,7 @@ when: not (service.iterate | default(False)) | bool notify: "{{ container_check.results | select('changed') | map(attribute='item.key') | map('regex_replace', '^(.*)$', 'Restart \\1 container') | list }}" -- name: Include tasks +- name: "{{ kolla_role_name | default(project_name) }} | Check containers that require iteration" vars: service: "{{ outer_item.value }}" include_tasks: iterated.yml diff --git a/ansible/roles/service-image-info/tasks/main.yml b/ansible/roles/service-image-info/tasks/main.yml index df5c39dd57..734472f68f 100644 --- a/ansible/roles/service-image-info/tasks/main.yml +++ b/ansible/roles/service-image-info/tasks/main.yml @@ -4,11 +4,13 @@ delegate_to: "{{ service_image_info_delegate_host }}" when: kolla_container_engine == 'docker' block: - - community.docker.docker_image_info: + - name: Get Docker image info + community.docker.docker_image_info: name: "{{ service.image }}" register: docker_image_info - - set_fact: + - name: Set service image info fact + set_fact: service_image_info: "{{ docker_image_info }}" delegate_facts: true @@ -17,10 +19,12 @@ delegate_to: "{{ service_image_info_delegate_host }}" when: kolla_container_engine == 'podman' block: - - containers.podman.podman_image_info: + - name: Get Podman image info + containers.podman.podman_image_info: name: "{{ service.image }}" register: podman_image_info - - set_fact: + - name: Set service image info fact + set_fact: service_image_info: "{{ podman_image_info }}" delegate_facts: true diff --git a/ansible/roles/service-rabbitmq/tasks/main.yml b/ansible/roles/service-rabbitmq/tasks/main.yml index 550bc679b7..4e6d508a20 100644 --- a/ansible/roles/service-rabbitmq/tasks/main.yml +++ b/ansible/roles/service-rabbitmq/tasks/main.yml @@ -1,5 +1,6 @@ --- -- become: true +- name: Create RabbitMQ vhosts and users + become: true delegate_to: "{{ service_rabbitmq_delegate_host }}" run_once: "{{ service_rabbitmq_run_once }}" when: service_rabbitmq_when | bool diff --git a/ansible/roles/skyline/tasks/bootstrap.yml b/ansible/roles/skyline/tasks/bootstrap.yml index 7b1168ebcd..87f481dfc6 100644 --- a/ansible/roles/skyline/tasks/bootstrap.yml +++ b/ansible/roles/skyline/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run skyline bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/skyline/tasks/check-containers.yml b/ansible/roles/skyline/tasks/check-containers.yml index b7e2f7c29f..0b134ba17b 100644 --- a/ansible/roles/skyline/tasks/check-containers.yml +++ b/ansible/roles/skyline/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check skyline containers + import_role: name: service-check-containers diff --git a/ansible/roles/skyline/tasks/config.yml b/ansible/roles/skyline/tasks/config.yml index 58c1d97928..7ca6f8b8ad 100644 --- a/ansible/roles/skyline/tasks/config.yml +++ b/ansible/roles/skyline/tasks/config.yml @@ -9,7 +9,8 @@ become: true with_dict: "{{ skyline_services | select_services_enabled_and_mapped_to_host }}" -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - skyline_copy_certs | bool diff --git a/ansible/roles/skyline/tasks/deploy-containers.yml b/ansible/roles/skyline/tasks/deploy-containers.yml index eb24ab5c7a..0d79578b96 100644 --- a/ansible/roles/skyline/tasks/deploy-containers.yml +++ b/ansible/roles/skyline/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check skyline containers + import_tasks: check-containers.yml diff --git a/ansible/roles/skyline/tasks/deploy.yml b/ansible/roles/skyline/tasks/deploy.yml index d793a349da..aec713966e 100644 --- a/ansible/roles/skyline/tasks/deploy.yml +++ b/ansible/roles/skyline/tasks/deploy.yml @@ -1,11 +1,15 @@ --- -- import_tasks: register.yml +- name: Register skyline in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure skyline + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check skyline containers + import_tasks: check-containers.yml -- import_tasks: bootstrap.yml +- name: Bootstrap skyline service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/skyline/tasks/main.yml b/ansible/roles/skyline/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/skyline/tasks/main.yml +++ b/ansible/roles/skyline/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/skyline/tasks/precheck.yml b/ansible/roles/skyline/tasks/precheck.yml index 25fefb1bc1..7097ccec70 100644 --- a/ansible/roles/skyline/tasks/precheck.yml +++ b/ansible/roles/skyline/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck skyline configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ skyline_services }}" diff --git a/ansible/roles/skyline/tasks/pull.yml b/ansible/roles/skyline/tasks/pull.yml index 53f9c5fda1..0e17addd9d 100644 --- a/ansible/roles/skyline/tasks/pull.yml +++ b/ansible/roles/skyline/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull skyline images + import_role: role: service-images-pull diff --git a/ansible/roles/skyline/tasks/reconfigure.yml b/ansible/roles/skyline/tasks/reconfigure.yml index f670a5b78d..bbcfaff026 100644 --- a/ansible/roles/skyline/tasks/reconfigure.yml +++ b/ansible/roles/skyline/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- include_tasks: deploy.yml +- name: Include tasks from deploy.yml + include_tasks: deploy.yml diff --git a/ansible/roles/skyline/tasks/register.yml b/ansible/roles/skyline/tasks/register.yml index 8cd7530f9d..91f9e9d77b 100644 --- a/ansible/roles/skyline/tasks/register.yml +++ b/ansible/roles/skyline/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register skyline service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_skyline_auth }}" diff --git a/ansible/roles/skyline/tasks/stop.yml b/ansible/roles/skyline/tasks/stop.yml index 965ab35b97..27ba019b76 100644 --- a/ansible/roles/skyline/tasks/stop.yml +++ b/ansible/roles/skyline/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop skyline containers + import_role: name: service-stop vars: project_services: "{{ skyline_services }}" diff --git a/ansible/roles/skyline/tasks/upgrade.yml b/ansible/roles/skyline/tasks/upgrade.yml index 49edff81e3..adec182922 100644 --- a/ansible/roles/skyline/tasks/upgrade.yml +++ b/ansible/roles/skyline/tasks/upgrade.yml @@ -1,7 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure skyline + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check skyline containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/tacker/tasks/bootstrap.yml b/ansible/roles/tacker/tasks/bootstrap.yml index aa4effcf01..27ae6a965c 100644 --- a/ansible/roles/tacker/tasks/bootstrap.yml +++ b/ansible/roles/tacker/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run tacker bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/tacker/tasks/check-containers.yml b/ansible/roles/tacker/tasks/check-containers.yml index b7e2f7c29f..95c7370e6b 100644 --- a/ansible/roles/tacker/tasks/check-containers.yml +++ b/ansible/roles/tacker/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check tacker containers + import_role: name: service-check-containers diff --git a/ansible/roles/tacker/tasks/config.yml b/ansible/roles/tacker/tasks/config.yml index 255494273c..e89f450352 100644 --- a/ansible/roles/tacker/tasks/config.yml +++ b/ansible/roles/tacker/tasks/config.yml @@ -28,7 +28,8 @@ when: - tacker_policy.results | length > 0 -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - tacker_copy_certs | bool diff --git a/ansible/roles/tacker/tasks/config_validate.yml b/ansible/roles/tacker/tasks/config_validate.yml index cc200fdbac..6fa23629fb 100644 --- a/ansible/roles/tacker/tasks/config_validate.yml +++ b/ansible/roles/tacker/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate tacker configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ tacker_services }}" diff --git a/ansible/roles/tacker/tasks/deploy-containers.yml b/ansible/roles/tacker/tasks/deploy-containers.yml index eb24ab5c7a..ab973e770e 100644 --- a/ansible/roles/tacker/tasks/deploy-containers.yml +++ b/ansible/roles/tacker/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check tacker containers + import_tasks: check-containers.yml diff --git a/ansible/roles/tacker/tasks/deploy.yml b/ansible/roles/tacker/tasks/deploy.yml index e1b6b66903..ba07e5a346 100644 --- a/ansible/roles/tacker/tasks/deploy.yml +++ b/ansible/roles/tacker/tasks/deploy.yml @@ -1,15 +1,20 @@ --- -- import_tasks: register.yml +- name: Register tacker in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure tacker + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check tacker containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone tacker repository + include_tasks: clone.yml when: - tacker_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap tacker service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/tacker/tasks/main.yml b/ansible/roles/tacker/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/tacker/tasks/main.yml +++ b/ansible/roles/tacker/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/tacker/tasks/precheck.yml b/ansible/roles/tacker/tasks/precheck.yml index 455a97295e..c57139cd9a 100644 --- a/ansible/roles/tacker/tasks/precheck.yml +++ b/ansible/roles/tacker/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck tacker configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ tacker_services }}" diff --git a/ansible/roles/tacker/tasks/pull.yml b/ansible/roles/tacker/tasks/pull.yml index 53f9c5fda1..53c12fb0d2 100644 --- a/ansible/roles/tacker/tasks/pull.yml +++ b/ansible/roles/tacker/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull tacker images + import_role: role: service-images-pull diff --git a/ansible/roles/tacker/tasks/reconfigure.yml b/ansible/roles/tacker/tasks/reconfigure.yml index 5b10a7e111..0144f22431 100644 --- a/ansible/roles/tacker/tasks/reconfigure.yml +++ b/ansible/roles/tacker/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy tacker + import_tasks: deploy.yml diff --git a/ansible/roles/tacker/tasks/register.yml b/ansible/roles/tacker/tasks/register.yml index 2c1f3bbf23..ce0b2bd38a 100644 --- a/ansible/roles/tacker/tasks/register.yml +++ b/ansible/roles/tacker/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register tacker service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_tacker_auth }}" diff --git a/ansible/roles/tacker/tasks/stop.yml b/ansible/roles/tacker/tasks/stop.yml index 3fcb813482..fd4658e145 100644 --- a/ansible/roles/tacker/tasks/stop.yml +++ b/ansible/roles/tacker/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop tacker containers + import_role: name: service-stop vars: project_services: "{{ tacker_services }}" diff --git a/ansible/roles/tacker/tasks/upgrade.yml b/ansible/roles/tacker/tasks/upgrade.yml index afeb387ddc..6123942a4c 100644 --- a/ansible/roles/tacker/tasks/upgrade.yml +++ b/ansible/roles/tacker/tasks/upgrade.yml @@ -32,11 +32,14 @@ when: - inventory_hostname not in tacker_hosts -- import_tasks: config.yml +- name: Configure tacker + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check tacker containers + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Run tacker bootstrap container + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/telegraf/tasks/check-containers.yml b/ansible/roles/telegraf/tasks/check-containers.yml index b7e2f7c29f..93f665ec62 100644 --- a/ansible/roles/telegraf/tasks/check-containers.yml +++ b/ansible/roles/telegraf/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check telegraf containers + import_role: name: service-check-containers diff --git a/ansible/roles/telegraf/tasks/config.yml b/ansible/roles/telegraf/tasks/config.yml index 04b27e0ad0..0ee22cd137 100644 --- a/ansible/roles/telegraf/tasks/config.yml +++ b/ansible/roles/telegraf/tasks/config.yml @@ -9,7 +9,8 @@ become: true with_dict: "{{ telegraf_services | select_services_enabled_and_mapped_to_host }}" -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - telegraf_copy_certs | bool diff --git a/ansible/roles/telegraf/tasks/deploy-containers.yml b/ansible/roles/telegraf/tasks/deploy-containers.yml index eb24ab5c7a..40407b9464 100644 --- a/ansible/roles/telegraf/tasks/deploy-containers.yml +++ b/ansible/roles/telegraf/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check telegraf containers + import_tasks: check-containers.yml diff --git a/ansible/roles/telegraf/tasks/deploy.yml b/ansible/roles/telegraf/tasks/deploy.yml index 49edff81e3..19c0ae97d8 100644 --- a/ansible/roles/telegraf/tasks/deploy.yml +++ b/ansible/roles/telegraf/tasks/deploy.yml @@ -1,7 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure telegraf + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check telegraf containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/telegraf/tasks/main.yml b/ansible/roles/telegraf/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/telegraf/tasks/main.yml +++ b/ansible/roles/telegraf/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/telegraf/tasks/precheck.yml b/ansible/roles/telegraf/tasks/precheck.yml index 061b295e5e..62592a8fe3 100644 --- a/ansible/roles/telegraf/tasks/precheck.yml +++ b/ansible/roles/telegraf/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck telegraf configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ telegraf_services }}" diff --git a/ansible/roles/telegraf/tasks/pull.yml b/ansible/roles/telegraf/tasks/pull.yml index 53f9c5fda1..f900e77e94 100644 --- a/ansible/roles/telegraf/tasks/pull.yml +++ b/ansible/roles/telegraf/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull telegraf images + import_role: role: service-images-pull diff --git a/ansible/roles/telegraf/tasks/reconfigure.yml b/ansible/roles/telegraf/tasks/reconfigure.yml index 5b10a7e111..7fb58184b4 100644 --- a/ansible/roles/telegraf/tasks/reconfigure.yml +++ b/ansible/roles/telegraf/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy telegraf + import_tasks: deploy.yml diff --git a/ansible/roles/telegraf/tasks/stop.yml b/ansible/roles/telegraf/tasks/stop.yml index 76dc764ff5..94d46293af 100644 --- a/ansible/roles/telegraf/tasks/stop.yml +++ b/ansible/roles/telegraf/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop telegraf containers + import_role: name: service-stop vars: project_services: "{{ telegraf_services }}" diff --git a/ansible/roles/telegraf/tasks/upgrade.yml b/ansible/roles/telegraf/tasks/upgrade.yml index 49edff81e3..19c0ae97d8 100644 --- a/ansible/roles/telegraf/tasks/upgrade.yml +++ b/ansible/roles/telegraf/tasks/upgrade.yml @@ -1,7 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure telegraf + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check telegraf containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/trove/tasks/bootstrap.yml b/ansible/roles/trove/tasks/bootstrap.yml index 2c3711bcd7..f9f6545356 100644 --- a/ansible/roles/trove/tasks/bootstrap.yml +++ b/ansible/roles/trove/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run trove bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/trove/tasks/check-containers.yml b/ansible/roles/trove/tasks/check-containers.yml index b7e2f7c29f..b2a5f412ef 100644 --- a/ansible/roles/trove/tasks/check-containers.yml +++ b/ansible/roles/trove/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check trove containers + import_role: name: service-check-containers diff --git a/ansible/roles/trove/tasks/config.yml b/ansible/roles/trove/tasks/config.yml index 459b71c404..eab77ce9de 100644 --- a/ansible/roles/trove/tasks/config.yml +++ b/ansible/roles/trove/tasks/config.yml @@ -28,7 +28,8 @@ when: - trove_policy.results | length > 0 -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - trove_copy_certs | bool diff --git a/ansible/roles/trove/tasks/config_validate.yml b/ansible/roles/trove/tasks/config_validate.yml index b8c4c0166e..05bd756b49 100644 --- a/ansible/roles/trove/tasks/config_validate.yml +++ b/ansible/roles/trove/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate trove configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ trove_services }}" diff --git a/ansible/roles/trove/tasks/deploy-containers.yml b/ansible/roles/trove/tasks/deploy-containers.yml index eb24ab5c7a..cb614b6b8f 100644 --- a/ansible/roles/trove/tasks/deploy-containers.yml +++ b/ansible/roles/trove/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check trove containers + import_tasks: check-containers.yml diff --git a/ansible/roles/trove/tasks/deploy.yml b/ansible/roles/trove/tasks/deploy.yml index e0323b3778..c0b1606819 100644 --- a/ansible/roles/trove/tasks/deploy.yml +++ b/ansible/roles/trove/tasks/deploy.yml @@ -1,14 +1,19 @@ --- -- import_tasks: register.yml +- name: Register trove in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure trove + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check trove containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone trove repository + include_tasks: clone.yml when: trove_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap trove service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/trove/tasks/main.yml b/ansible/roles/trove/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/trove/tasks/main.yml +++ b/ansible/roles/trove/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/trove/tasks/precheck.yml b/ansible/roles/trove/tasks/precheck.yml index 3ef467eb6a..c453f62487 100644 --- a/ansible/roles/trove/tasks/precheck.yml +++ b/ansible/roles/trove/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck trove configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ trove_services }}" diff --git a/ansible/roles/trove/tasks/pull.yml b/ansible/roles/trove/tasks/pull.yml index 53f9c5fda1..fe37fbe3c0 100644 --- a/ansible/roles/trove/tasks/pull.yml +++ b/ansible/roles/trove/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull trove images + import_role: role: service-images-pull diff --git a/ansible/roles/trove/tasks/reconfigure.yml b/ansible/roles/trove/tasks/reconfigure.yml index 5b10a7e111..6d887a5163 100644 --- a/ansible/roles/trove/tasks/reconfigure.yml +++ b/ansible/roles/trove/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy trove + import_tasks: deploy.yml diff --git a/ansible/roles/trove/tasks/register.yml b/ansible/roles/trove/tasks/register.yml index c8d0b39113..703e403422 100644 --- a/ansible/roles/trove/tasks/register.yml +++ b/ansible/roles/trove/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register trove service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_trove_auth }}" diff --git a/ansible/roles/trove/tasks/stop.yml b/ansible/roles/trove/tasks/stop.yml index 8cd7545d82..af20c81457 100644 --- a/ansible/roles/trove/tasks/stop.yml +++ b/ansible/roles/trove/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop trove containers + import_role: name: service-stop vars: project_services: "{{ trove_services }}" diff --git a/ansible/roles/trove/tasks/upgrade.yml b/ansible/roles/trove/tasks/upgrade.yml index 6ba9f99799..00607cc634 100644 --- a/ansible/roles/trove/tasks/upgrade.yml +++ b/ansible/roles/trove/tasks/upgrade.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure trove + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check trove containers + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Run trove bootstrap container + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/valkey/tasks/check-containers.yml b/ansible/roles/valkey/tasks/check-containers.yml index b7e2f7c29f..313eb60a5b 100644 --- a/ansible/roles/valkey/tasks/check-containers.yml +++ b/ansible/roles/valkey/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check valkey containers + import_role: name: service-check-containers diff --git a/ansible/roles/valkey/tasks/deploy-containers.yml b/ansible/roles/valkey/tasks/deploy-containers.yml index eb24ab5c7a..a71908238f 100644 --- a/ansible/roles/valkey/tasks/deploy-containers.yml +++ b/ansible/roles/valkey/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check valkey containers + import_tasks: check-containers.yml diff --git a/ansible/roles/valkey/tasks/deploy.yml b/ansible/roles/valkey/tasks/deploy.yml index 49edff81e3..9ba72297ac 100644 --- a/ansible/roles/valkey/tasks/deploy.yml +++ b/ansible/roles/valkey/tasks/deploy.yml @@ -1,7 +1,9 @@ --- -- import_tasks: config.yml +- name: Configure valkey + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check valkey containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/valkey/tasks/main.yml b/ansible/roles/valkey/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/valkey/tasks/main.yml +++ b/ansible/roles/valkey/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/valkey/tasks/precheck.yml b/ansible/roles/valkey/tasks/precheck.yml index 689fcfb6ff..5d629f0168 100644 --- a/ansible/roles/valkey/tasks/precheck.yml +++ b/ansible/roles/valkey/tasks/precheck.yml @@ -14,7 +14,8 @@ set_fact: valkey_is_migrating: "{{ redis_container_facts.containers['redis'] is defined }}" -- import_role: +- name: Precheck valkey configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ valkey_services }}" diff --git a/ansible/roles/valkey/tasks/pull.yml b/ansible/roles/valkey/tasks/pull.yml index 53f9c5fda1..96fca814ce 100644 --- a/ansible/roles/valkey/tasks/pull.yml +++ b/ansible/roles/valkey/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull valkey images + import_role: role: service-images-pull diff --git a/ansible/roles/valkey/tasks/reconfigure.yml b/ansible/roles/valkey/tasks/reconfigure.yml index 5b10a7e111..45979b3ac5 100644 --- a/ansible/roles/valkey/tasks/reconfigure.yml +++ b/ansible/roles/valkey/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy valkey + import_tasks: deploy.yml diff --git a/ansible/roles/valkey/tasks/stop.yml b/ansible/roles/valkey/tasks/stop.yml index a175892b76..bf9eb87a87 100644 --- a/ansible/roles/valkey/tasks/stop.yml +++ b/ansible/roles/valkey/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop valkey containers + import_role: name: service-stop vars: project_services: "{{ valkey_services }}" diff --git a/ansible/roles/valkey/tasks/upgrade.yml b/ansible/roles/valkey/tasks/upgrade.yml index e40b699b9c..75d40b14c4 100644 --- a/ansible/roles/valkey/tasks/upgrade.yml +++ b/ansible/roles/valkey/tasks/upgrade.yml @@ -130,7 +130,8 @@ - name: Verify Valkey responds on port 6379 import_tasks: check.yml -- import_tasks: check-containers.yml +- name: Check valkey containers + import_tasks: check-containers.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/watcher/tasks/bootstrap.yml b/ansible/roles/watcher/tasks/bootstrap.yml index c1e7f14c79..5e9462e1fb 100644 --- a/ansible/roles/watcher/tasks/bootstrap.yml +++ b/ansible/roles/watcher/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run watcher bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/watcher/tasks/check-containers.yml b/ansible/roles/watcher/tasks/check-containers.yml index b7e2f7c29f..069e2fb5d9 100644 --- a/ansible/roles/watcher/tasks/check-containers.yml +++ b/ansible/roles/watcher/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check watcher containers + import_role: name: service-check-containers diff --git a/ansible/roles/watcher/tasks/config.yml b/ansible/roles/watcher/tasks/config.yml index fdaefc185f..6e89c7f481 100644 --- a/ansible/roles/watcher/tasks/config.yml +++ b/ansible/roles/watcher/tasks/config.yml @@ -28,7 +28,8 @@ when: - watcher_policy.results | length > 0 -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - watcher_copy_certs | bool diff --git a/ansible/roles/watcher/tasks/config_validate.yml b/ansible/roles/watcher/tasks/config_validate.yml index 1e74980f5a..3a6b261e34 100644 --- a/ansible/roles/watcher/tasks/config_validate.yml +++ b/ansible/roles/watcher/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate watcher configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ watcher_services }}" diff --git a/ansible/roles/watcher/tasks/deploy-containers.yml b/ansible/roles/watcher/tasks/deploy-containers.yml index eb24ab5c7a..acf0c7adc2 100644 --- a/ansible/roles/watcher/tasks/deploy-containers.yml +++ b/ansible/roles/watcher/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check watcher containers + import_tasks: check-containers.yml diff --git a/ansible/roles/watcher/tasks/deploy.yml b/ansible/roles/watcher/tasks/deploy.yml index f7c2f450a2..cdb4f6991d 100644 --- a/ansible/roles/watcher/tasks/deploy.yml +++ b/ansible/roles/watcher/tasks/deploy.yml @@ -1,14 +1,19 @@ --- -- import_tasks: register.yml +- name: Register watcher in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure watcher + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check watcher containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone watcher repository + include_tasks: clone.yml when: watcher_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap watcher service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/watcher/tasks/main.yml b/ansible/roles/watcher/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/watcher/tasks/main.yml +++ b/ansible/roles/watcher/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/watcher/tasks/precheck.yml b/ansible/roles/watcher/tasks/precheck.yml index 9d7465d703..7b7a43ee25 100644 --- a/ansible/roles/watcher/tasks/precheck.yml +++ b/ansible/roles/watcher/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck watcher configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ watcher_services }}" diff --git a/ansible/roles/watcher/tasks/pull.yml b/ansible/roles/watcher/tasks/pull.yml index 53f9c5fda1..590745bf51 100644 --- a/ansible/roles/watcher/tasks/pull.yml +++ b/ansible/roles/watcher/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull watcher images + import_role: role: service-images-pull diff --git a/ansible/roles/watcher/tasks/reconfigure.yml b/ansible/roles/watcher/tasks/reconfigure.yml index 5b10a7e111..3ac641b5ef 100644 --- a/ansible/roles/watcher/tasks/reconfigure.yml +++ b/ansible/roles/watcher/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy watcher + import_tasks: deploy.yml diff --git a/ansible/roles/watcher/tasks/register.yml b/ansible/roles/watcher/tasks/register.yml index 488b5c09f1..2b6c0b78fb 100644 --- a/ansible/roles/watcher/tasks/register.yml +++ b/ansible/roles/watcher/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register watcher service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_watcher_auth }}" diff --git a/ansible/roles/watcher/tasks/stop.yml b/ansible/roles/watcher/tasks/stop.yml index f85ed42e7e..a9e9ef8b0b 100644 --- a/ansible/roles/watcher/tasks/stop.yml +++ b/ansible/roles/watcher/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop watcher containers + import_role: name: service-stop vars: project_services: "{{ watcher_services }}" diff --git a/ansible/roles/watcher/tasks/upgrade.yml b/ansible/roles/watcher/tasks/upgrade.yml index 6ba9f99799..67c8a3c154 100644 --- a/ansible/roles/watcher/tasks/upgrade.yml +++ b/ansible/roles/watcher/tasks/upgrade.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure watcher + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check watcher containers + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Run watcher bootstrap container + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/zun/tasks/bootstrap.yml b/ansible/roles/zun/tasks/bootstrap.yml index 3ec453be6e..2ffe90839b 100644 --- a/ansible/roles/zun/tasks/bootstrap.yml +++ b/ansible/roles/zun/tasks/bootstrap.yml @@ -37,4 +37,5 @@ when: - not use_preconfigured_databases | bool -- import_tasks: bootstrap_service.yml +- name: Run zun bootstrap container + import_tasks: bootstrap_service.yml diff --git a/ansible/roles/zun/tasks/check-containers.yml b/ansible/roles/zun/tasks/check-containers.yml index b7e2f7c29f..c670c9265e 100644 --- a/ansible/roles/zun/tasks/check-containers.yml +++ b/ansible/roles/zun/tasks/check-containers.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Check zun containers + import_role: name: service-check-containers diff --git a/ansible/roles/zun/tasks/config.yml b/ansible/roles/zun/tasks/config.yml index 850f353d72..009fbda3fc 100644 --- a/ansible/roles/zun/tasks/config.yml +++ b/ansible/roles/zun/tasks/config.yml @@ -9,7 +9,8 @@ become: true with_dict: "{{ zun_services | select_services_enabled_and_mapped_to_host }}" -- include_tasks: external_ceph.yml +- name: Include tasks from external_ceph.yml + include_tasks: external_ceph.yml when: - zun_configure_for_cinder_ceph | bool - inventory_hostname in groups['zun-compute'] @@ -33,7 +34,8 @@ when: - zun_policy.results | length > 0 -- include_tasks: copy-certs.yml +- name: Copying over TLS certificates + include_tasks: copy-certs.yml when: - zun_copy_certs | bool diff --git a/ansible/roles/zun/tasks/config_validate.yml b/ansible/roles/zun/tasks/config_validate.yml index 9803248961..ba052a6792 100644 --- a/ansible/roles/zun/tasks/config_validate.yml +++ b/ansible/roles/zun/tasks/config_validate.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Validate zun configuration + import_role: name: service-config-validate vars: service_config_validate_services: "{{ zun_services }}" diff --git a/ansible/roles/zun/tasks/deploy-containers.yml b/ansible/roles/zun/tasks/deploy-containers.yml index eb24ab5c7a..0e652e58b7 100644 --- a/ansible/roles/zun/tasks/deploy-containers.yml +++ b/ansible/roles/zun/tasks/deploy-containers.yml @@ -1,2 +1,3 @@ --- -- import_tasks: check-containers.yml +- name: Check zun containers + import_tasks: check-containers.yml diff --git a/ansible/roles/zun/tasks/deploy.yml b/ansible/roles/zun/tasks/deploy.yml index 7e14eb039f..076e7f5cf3 100644 --- a/ansible/roles/zun/tasks/deploy.yml +++ b/ansible/roles/zun/tasks/deploy.yml @@ -1,14 +1,19 @@ --- -- import_tasks: register.yml +- name: Register zun in Keystone + import_tasks: register.yml -- import_tasks: config.yml +- name: Configure zun + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check zun containers + import_tasks: check-containers.yml -- include_tasks: clone.yml +- name: Clone zun repository + include_tasks: clone.yml when: zun_dev_mode | bool -- import_tasks: bootstrap.yml +- name: Bootstrap zun service + import_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/zun/tasks/main.yml b/ansible/roles/zun/tasks/main.yml index bc5d1e6257..7a1d916c4a 100644 --- a/ansible/roles/zun/tasks/main.yml +++ b/ansible/roles/zun/tasks/main.yml @@ -1,2 +1,3 @@ --- -- include_tasks: "{{ kolla_action }}.yml" +- name: "Include tasks for action {{ kolla_action }}" + include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/zun/tasks/precheck.yml b/ansible/roles/zun/tasks/precheck.yml index cd727ebe3b..aa3a7bb33f 100644 --- a/ansible/roles/zun/tasks/precheck.yml +++ b/ansible/roles/zun/tasks/precheck.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Precheck zun configuration + import_role: name: service-precheck vars: service_precheck_services: "{{ zun_services }}" diff --git a/ansible/roles/zun/tasks/pull.yml b/ansible/roles/zun/tasks/pull.yml index 53f9c5fda1..b695779636 100644 --- a/ansible/roles/zun/tasks/pull.yml +++ b/ansible/roles/zun/tasks/pull.yml @@ -1,3 +1,4 @@ --- -- import_role: +- name: Pull zun images + import_role: role: service-images-pull diff --git a/ansible/roles/zun/tasks/reconfigure.yml b/ansible/roles/zun/tasks/reconfigure.yml index 5b10a7e111..7630fe6d75 100644 --- a/ansible/roles/zun/tasks/reconfigure.yml +++ b/ansible/roles/zun/tasks/reconfigure.yml @@ -1,2 +1,3 @@ --- -- import_tasks: deploy.yml +- name: Deploy zun + import_tasks: deploy.yml diff --git a/ansible/roles/zun/tasks/register.yml b/ansible/roles/zun/tasks/register.yml index afc840e7f0..6d67a4ad34 100644 --- a/ansible/roles/zun/tasks/register.yml +++ b/ansible/roles/zun/tasks/register.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Register zun service, endpoints, and users in Keystone + import_role: name: service-ks-register vars: service_ks_register_auth: "{{ openstack_zun_auth }}" diff --git a/ansible/roles/zun/tasks/stop.yml b/ansible/roles/zun/tasks/stop.yml index 646317f86e..29072bf13d 100644 --- a/ansible/roles/zun/tasks/stop.yml +++ b/ansible/roles/zun/tasks/stop.yml @@ -1,5 +1,6 @@ --- -- import_role: +- name: Stop zun containers + import_role: name: service-stop vars: project_services: "{{ zun_services }}" diff --git a/ansible/roles/zun/tasks/upgrade.yml b/ansible/roles/zun/tasks/upgrade.yml index 6ba9f99799..3355116119 100644 --- a/ansible/roles/zun/tasks/upgrade.yml +++ b/ansible/roles/zun/tasks/upgrade.yml @@ -1,9 +1,12 @@ --- -- import_tasks: config.yml +- name: Configure zun + import_tasks: config.yml -- import_tasks: check-containers.yml +- name: Check zun containers + import_tasks: check-containers.yml -- import_tasks: bootstrap_service.yml +- name: Run zun bootstrap container + import_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/site.yml b/ansible/site.yml index 3d03d336f7..9cec91e08b 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -146,169 +146,202 @@ roles: - { role: loadbalancer } tasks: - - when: + - name: Configure loadbalancer for enabled services + when: - enable_haproxy | bool - kolla_action in ['deploy', 'reconfigure', 'upgrade', 'config'] block: - - include_role: + - name: Configure loadbalancer for aodh + include_role: name: aodh tasks_from: loadbalancer tags: aodh when: enable_aodh | bool - - include_role: + - name: Configure loadbalancer for barbican + include_role: name: barbican tasks_from: loadbalancer tags: barbican when: enable_barbican | bool - - include_role: + - name: Configure loadbalancer for blazar + include_role: name: blazar tasks_from: loadbalancer tags: blazar when: enable_blazar | bool - - include_role: + - name: Configure loadbalancer for ceph-rgw + include_role: name: ceph-rgw tasks_from: loadbalancer tags: ceph-rgw when: enable_ceph_rgw | bool - - include_role: + - name: Configure loadbalancer for cinder + include_role: name: cinder tasks_from: loadbalancer tags: cinder when: enable_cinder | bool - - include_role: + - name: Configure loadbalancer for cloudkitty + include_role: name: cloudkitty tasks_from: loadbalancer tags: cloudkitty when: enable_cloudkitty | bool - - include_role: + - name: Configure loadbalancer for cyborg + include_role: name: cyborg tasks_from: loadbalancer tags: cyborg when: enable_cyborg | bool - - include_role: + - name: Configure loadbalancer for designate + include_role: name: designate tasks_from: loadbalancer tags: designate when: enable_designate | bool - - include_role: + - name: Configure loadbalancer for etcd + include_role: name: etcd tasks_from: loadbalancer tags: etcd when: enable_etcd | bool - - include_role: + - name: Configure loadbalancer for glance + include_role: name: glance tasks_from: loadbalancer tags: glance when: enable_glance | bool - - include_role: + - name: Configure loadbalancer for gnocchi + include_role: name: gnocchi tasks_from: loadbalancer tags: gnocchi when: enable_gnocchi | bool - - include_role: + - name: Configure loadbalancer for grafana + include_role: name: grafana tasks_from: loadbalancer tags: grafana when: enable_grafana | bool - - include_role: + - name: Configure loadbalancer for heat + include_role: name: heat tasks_from: loadbalancer tags: heat when: enable_heat | bool - - include_role: + - name: Configure loadbalancer for horizon + include_role: name: horizon tasks_from: loadbalancer tags: horizon when: enable_horizon | bool - - include_role: + - name: Configure loadbalancer for influxdb + include_role: name: influxdb tasks_from: loadbalancer tags: influxdb when: enable_influxdb | bool - - include_role: + - name: Configure loadbalancer for ironic + include_role: name: ironic tasks_from: loadbalancer tags: ironic when: enable_ironic | bool - - include_role: + - name: Configure loadbalancer for keystone + include_role: name: keystone tasks_from: loadbalancer tags: keystone when: enable_keystone | bool - - include_role: + - name: Configure loadbalancer for letsencrypt + include_role: name: letsencrypt tasks_from: loadbalancer tags: letsencrypt when: enable_letsencrypt | bool - - include_role: + - name: Configure loadbalancer for magnum + include_role: name: magnum tasks_from: loadbalancer tags: magnum when: enable_magnum | bool - - include_role: + - name: Configure loadbalancer for manila + include_role: name: manila tasks_from: loadbalancer tags: manila when: enable_manila | bool - - include_role: + - name: Configure loadbalancer for mariadb + include_role: name: mariadb tasks_from: loadbalancer tags: mariadb when: enable_mariadb | bool or enable_external_mariadb_load_balancer | bool - - include_role: + - name: Configure loadbalancer for masakari + include_role: name: masakari tasks_from: loadbalancer tags: masakari when: enable_masakari | bool - - include_role: + - name: Configure loadbalancer for memcached + include_role: name: memcached tasks_from: loadbalancer tags: memcached when: enable_memcached | bool - - include_role: + - name: Configure loadbalancer for mistral + include_role: name: mistral tasks_from: loadbalancer tags: mistral when: enable_mistral | bool - - include_role: + - name: Configure loadbalancer for neutron + include_role: name: neutron tasks_from: loadbalancer tags: neutron when: enable_neutron | bool - - include_role: + - name: Configure loadbalancer for placement + include_role: name: placement tasks_from: loadbalancer tags: placement - - include_role: + - name: Configure loadbalancer for nova + include_role: name: nova tasks_from: loadbalancer tags: - nova - nova-api when: enable_nova | bool - - include_role: + - name: Configure loadbalancer for nova-cell + include_role: name: nova-cell tasks_from: loadbalancer tags: - nova - nova-cell when: enable_nova | bool - - include_role: + - name: Configure loadbalancer for octavia + include_role: name: octavia tasks_from: loadbalancer tags: octavia when: enable_octavia | bool - - include_role: + - name: Configure loadbalancer for opensearch + include_role: name: opensearch tasks_from: loadbalancer tags: opensearch when: enable_opensearch | bool - - include_role: + - name: Configure loadbalancer for prometheus + include_role: name: prometheus tasks_from: loadbalancer tags: prometheus when: enable_prometheus | bool - - include_role: + - name: Configure loadbalancer for rabbitmq + include_role: name: rabbitmq tasks_from: loadbalancer tags: rabbitmq @@ -316,34 +349,40 @@ role_rabbitmq_cluster_cookie: role_rabbitmq_groups: when: enable_rabbitmq | bool - - include_role: + - name: Configure loadbalancer for skyline + include_role: name: skyline tasks_from: loadbalancer tags: skyline when: enable_skyline | bool - - include_role: + - name: Configure loadbalancer for tacker + include_role: name: tacker tasks_from: loadbalancer tags: tacker when: enable_tacker | bool - - include_role: + - name: Configure loadbalancer for trove + include_role: name: trove tasks_from: loadbalancer tags: trove when: enable_trove | bool - - include_role: + - name: Configure loadbalancer for watcher + include_role: name: watcher tasks_from: loadbalancer tags: watcher when: enable_watcher | bool - - include_role: + - name: Configure loadbalancer for zun + include_role: name: zun tasks_from: loadbalancer tags: zun when: enable_zun | bool # NOTE(r-krcek): This last step will notify handlers if any # changes to the configuration have been made. - - include_role: + - name: Check loadbalancer containers + include_role: name: loadbalancer tasks_from: check-containers when: kolla_action != 'config' diff --git a/doc/source/reference/bare-metal/ironic-guide.rst b/doc/source/reference/bare-metal/ironic-guide.rst index 99e8bbefb2..fbbe00ff2e 100644 --- a/doc/source/reference/bare-metal/ironic-guide.rst +++ b/doc/source/reference/bare-metal/ironic-guide.rst @@ -52,6 +52,16 @@ For example it can be the same address as default router for the range: routers: "192.168.5.1" ntp_server: "192.168.5.1" +Provide a DNS server if the inspection ramdisk (IPA) needs to resolve +Fully Qualified Domain Names (FQDNs) for API access. To specify multiple +servers, use a comma-separated list. + +.. code-block:: yaml + + ironic_dnsmasq_dhcp_ranges: + - range: "192.168.5.100,192.168.5.110" + dns_servers: "192.168.5.10,192.168.5.11" + To support DHCP relay, it is also possible to define a netmask in the range. It is advisable to also provide a router to allow the traffic to reach the Ironic server. diff --git a/releasenotes/notes/bug-2049209-opensearch_plugin_timeout-d79d03769de093bd.yaml b/releasenotes/notes/bug-2049209-opensearch_plugin_timeout-d79d03769de093bd.yaml new file mode 100644 index 0000000000..292f10af86 --- /dev/null +++ b/releasenotes/notes/bug-2049209-opensearch_plugin_timeout-d79d03769de093bd.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Fixes an issue where OpenSearch log retention check would fail due to + plugins not being fully loaded, resulting in a timeout error. + This was caused by the task that checks for the existence of a log. + Added a check before plugin tasks to ensure plugins are fully loaded. diff --git a/releasenotes/notes/dns-config-via-ironic-dhcp-6727d8c93acf654c.yaml b/releasenotes/notes/dns-config-via-ironic-dhcp-6727d8c93acf654c.yaml new file mode 100644 index 0000000000..ca21a316ef --- /dev/null +++ b/releasenotes/notes/dns-config-via-ironic-dhcp-6727d8c93acf654c.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + Ironic DHCP can now be configured to supply DNS servers via + ``ironic_dnsmasq_dhcp_ranges``. This enables the inspection ramdisk (IPA) + to reach FQDN API endpoints. diff --git a/releasenotes/notes/uwsgi-designate-649599b4b9a1bdfd.yaml b/releasenotes/notes/uwsgi-designate-649599b4b9a1bdfd.yaml new file mode 100644 index 0000000000..65097770c2 --- /dev/null +++ b/releasenotes/notes/uwsgi-designate-649599b4b9a1bdfd.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + ``designate-api`` is now running under uWSGI and now supports backend TLS. diff --git a/roles/kolla-ansible-tempest/defaults/main.yml b/roles/kolla-ansible-tempest/defaults/main.yml index 1c296e926b..bdf969cc8c 100644 --- a/roles/kolla-ansible-tempest/defaults/main.yml +++ b/roles/kolla-ansible-tempest/defaults/main.yml @@ -8,5 +8,6 @@ kolla_ansible_tempest_cirros_ver: "0.6.3" kolla_ansible_tempest_exclude_regex: "" kolla_ansible_tempest_packages_extra: [] kolla_ansible_tempest_regex: "" +kolla_ansible_tempest_upper_constraints: "{{ ansible_env.HOME }}/src/opendev.org/openstack/requirements/upper-constraints.txt" post_upgrade: false diff --git a/roles/kolla-ansible-tempest/tasks/main.yml b/roles/kolla-ansible-tempest/tasks/main.yml index 4fdb8571c0..e0054d3c33 100644 --- a/roles/kolla-ansible-tempest/tasks/main.yml +++ b/roles/kolla-ansible-tempest/tasks/main.yml @@ -2,6 +2,7 @@ - name: Install required packages ansible.builtin.pip: name: "{{ kolla_ansible_tempest_packages + kolla_ansible_tempest_packages_extra }}" + extra_args: "{{ ('-c' + kolla_ansible_tempest_upper_constraints) if kolla_ansible_tempest_upper_constraints | length > 0 }}" virtualenv: "{{ kolla_ansible_venv_path }}" virtualenv_command: "python3 -m venv" diff --git a/tests/check-failure.sh b/tests/check-failure.sh index db599bf1ff..19d2f071f2 100755 --- a/tests/check-failure.sh +++ b/tests/check-failure.sh @@ -97,7 +97,7 @@ check_failure() { if [[ -n "$unhealthy_containers" ]]; then # NOTE(mnasiadka): try checking them again, because usually they are healthy now - ech "Discovered unhealthy containers - sleeping 60 seconds and retrying check" + echo "Discovered unhealthy containers - sleeping 60 seconds and retrying check" sleep 60 if [ "$CONTAINER_ENGINE" = "docker" ]; then check_docker_unhealthies diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index 77e050e9f2..57ad30293b 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -118,10 +118,6 @@ enable_barbican: "yes" enable_heat: "yes" # NOTE(yoctozepto): see https://bugs.launchpad.net/kolla-ansible/+bug/1906299 enable_aodh: "yes" -# TODO(gkoper): Remove after G/2026.1 release -{% if is_previous_release %} -enable_redis: "yes" -{% endif %} {% endif %} {% if scenario == "ironic" %} @@ -166,10 +162,6 @@ nova_backend_ceph: "yes" rabbitmq_cluster_partition_handling: "autoheal" rabbitmq_extra_config: cluster_keepalive_interval: 50000 -# TODO(gkoper): Remove after G/2026.1 release -{% if is_previous_release %} -enable_redis: "yes" -{% endif %} enable_ceph_rgw: "yes" ceph_rgw_hosts: @@ -204,10 +196,6 @@ enable_octavia: "yes" octavia_provider_drivers: "ovn:OVN provider" octavia_provider_agents: "ovn" neutron_dns_domain: "example.org." -# TODO(gkoper): Remove after G/2026.1 release -{% if is_previous_release %} -enable_redis: "yes" -{% endif %} {% endif %} {% if scenario == "prometheus-opensearch" %} @@ -240,10 +228,6 @@ octavia_amp_flavor: disk: 5 octavia_network_type: "tenant" enable_valkey: "yes" -# TODO(gkoper): Remove after G/2026.1 release -{% if is_previous_release %} -enable_redis: "yes" -{% endif %} {% endif %} {% if groups['all'] | length == 1 %} diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index cd46c19679..33eff0080c 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -74,7 +74,7 @@ neutron_tenant_network_dns_server: "8.8.8.8" neutron_tenant_network_prefix: "203.0.113." neutron_tenant_network_prefix_length: "24" - previous_release: "{{ '2025.1' if is_slurp else '2025.1' }}" + previous_release: "{{ '2025.1' if is_slurp else '2025.2' }}" scenario: core scenario_images_core: - ^cron diff --git a/zuul.d/scenarios/aio.yaml b/zuul.d/scenarios/aio.yaml index 384a06b271..cb292e5229 100644 --- a/zuul.d/scenarios/aio.yaml +++ b/zuul.d/scenarios/aio.yaml @@ -79,6 +79,12 @@ parent: kolla-ansible-aio-base nodeset: kolla-ansible-rocky-10-16GB +- job: + name: kolla-ansible-rocky-10-upgrade + parent: kolla-ansible-aio-base + nodeset: kolla-ansible-rocky-10-16GB + timeout: 10800 + - job: name: kolla-ansible-rocky-10-podman parent: kolla-ansible-rocky-10 @@ -121,6 +127,7 @@ - kolla-ansible-debian-bookworm-podman - kolla-ansible-debian-bookworm-upgrade - kolla-ansible-rocky-10 + - kolla-ansible-rocky-10-upgrade - kolla-ansible-rocky-10-podman - kolla-ansible-ubuntu-noble - kolla-ansible-ubuntu-noble-podman @@ -137,6 +144,7 @@ - kolla-ansible-debian-bookworm-podman - kolla-ansible-debian-bookworm-upgrade - kolla-ansible-rocky-10 + - kolla-ansible-rocky-10-upgrade - kolla-ansible-rocky-10-podman - kolla-ansible-ubuntu-noble - kolla-ansible-ubuntu-noble-upgrade diff --git a/zuul.d/scenarios/cephadm.yaml b/zuul.d/scenarios/cephadm.yaml index 2120af30e7..3df106c998 100644 --- a/zuul.d/scenarios/cephadm.yaml +++ b/zuul.d/scenarios/cephadm.yaml @@ -36,6 +36,20 @@ nodeset: kolla-ansible-debian-bookworm-multi-16GB timeout: 9000 +- job: + name: kolla-ansible-rocky-10-cephadm + parent: kolla-ansible-cephadm-base + nodeset: kolla-ansible-rocky-10-multi-16GB + timeout: 10800 + vars: + cephadm_use_package_from_distribution: true + +- job: + name: kolla-ansible-rocky-10-cephadm-upgrade + parent: kolla-ansible-rocky-10-cephadm + nodeset: kolla-ansible-rocky-10-multi-16GB + timeout: 10800 + - job: name: kolla-ansible-ubuntu-noble-cephadm parent: kolla-ansible-cephadm-base @@ -64,5 +78,7 @@ jobs: - kolla-ansible-debian-bookworm-cephadm - kolla-ansible-debian-bookworm-cephadm-upgrade + - kolla-ansible-rocky-10-cephadm + - kolla-ansible-rocky-10-cephadm-upgrade - kolla-ansible-ubuntu-noble-cephadm - kolla-ansible-ubuntu-noble-cephadm-upgrade diff --git a/zuul.d/scenarios/ironic.yaml b/zuul.d/scenarios/ironic.yaml index ee20005570..6f468cc95d 100644 --- a/zuul.d/scenarios/ironic.yaml +++ b/zuul.d/scenarios/ironic.yaml @@ -37,6 +37,11 @@ parent: kolla-ansible-ironic-base nodeset: kolla-ansible-rocky-10-16GB +- job: + name: kolla-ansible-rocky-10-ironic-upgrade + parent: kolla-ansible-rocky-10-ironic + nodeset: kolla-ansible-rocky-10-16GB + - job: name: kolla-ansible-ubuntu-noble-ironic parent: kolla-ansible-ironic-base @@ -56,5 +61,6 @@ - kolla-ansible-debian-bookworm-ironic - kolla-ansible-debian-bookworm-ironic-upgrade - kolla-ansible-rocky-10-ironic + - kolla-ansible-rocky-10-ironic-upgrade - kolla-ansible-ubuntu-noble-ironic - kolla-ansible-ubuntu-noble-ironic-upgrade diff --git a/zuul.d/scenarios/mariadb.yaml b/zuul.d/scenarios/mariadb.yaml index 3e540e93a1..8ce92f6e6e 100644 --- a/zuul.d/scenarios/mariadb.yaml +++ b/zuul.d/scenarios/mariadb.yaml @@ -27,14 +27,17 @@ name: kolla-ansible-debian-bookworm-mariadb-upgrade parent: kolla-ansible-mariadb-base nodeset: kolla-ansible-debian-bookworm-multi-16GB - vars: - is_upgrade: true - job: name: kolla-ansible-rocky-10-mariadb parent: kolla-ansible-mariadb-base nodeset: kolla-ansible-rocky-10-multi-16GB +- job: + name: kolla-ansible-rocky-10-mariadb-upgrade + parent: kolla-ansible-mariadb-base + nodeset: kolla-ansible-rocky-10-multi-16GB + - job: name: kolla-ansible-ubuntu-noble-mariadb parent: kolla-ansible-mariadb-base @@ -44,8 +47,6 @@ name: kolla-ansible-ubuntu-noble-mariadb-upgrade parent: kolla-ansible-mariadb-base nodeset: kolla-ansible-ubuntu-noble-multi-8GB - vars: - is_upgrade: true - project-template: name: kolla-ansible-scenario-mariadb @@ -56,6 +57,7 @@ - kolla-ansible-debian-bookworm-mariadb - kolla-ansible-debian-bookworm-mariadb-upgrade - kolla-ansible-rocky-10-mariadb + - kolla-ansible-rocky-10-mariadb-upgrade - kolla-ansible-ubuntu-noble-mariadb - kolla-ansible-ubuntu-noble-mariadb-upgrade gate: @@ -63,5 +65,6 @@ - kolla-ansible-debian-bookworm-mariadb - kolla-ansible-debian-bookworm-mariadb-upgrade - kolla-ansible-rocky-10-mariadb + - kolla-ansible-rocky-10-mariadb-upgrade - kolla-ansible-ubuntu-noble-mariadb - kolla-ansible-ubuntu-noble-mariadb-upgrade diff --git a/zuul.d/scenarios/ovn.yaml b/zuul.d/scenarios/ovn.yaml index 8ff50fbb9d..b9a6b1be2c 100644 --- a/zuul.d/scenarios/ovn.yaml +++ b/zuul.d/scenarios/ovn.yaml @@ -26,6 +26,17 @@ nodeset: kolla-ansible-debian-bookworm-multi-16GB timeout: 10800 +- job: + name: kolla-ansible-rocky-10-ovn + parent: kolla-ansible-ovn-base + nodeset: kolla-ansible-rocky-10-multi-16GB + +- job: + name: kolla-ansible-rocky-10-ovn-upgrade + parent: kolla-ansible-rocky-10-ovn + nodeset: kolla-ansible-rocky-10-multi-16GB + timeout: 10800 + - job: name: kolla-ansible-ubuntu-noble-ovn parent: kolla-ansible-ovn-base @@ -45,5 +56,7 @@ jobs: - kolla-ansible-debian-bookworm-ovn - kolla-ansible-debian-bookworm-ovn-upgrade + - kolla-ansible-rocky-10-ovn + - kolla-ansible-rocky-10-ovn-upgrade - kolla-ansible-ubuntu-noble-ovn - kolla-ansible-ubuntu-noble-ovn-upgrade diff --git a/zuul.d/scenarios/prometheus-opensearch.yaml b/zuul.d/scenarios/prometheus-opensearch.yaml index f17d34f7de..66ded1aeb6 100644 --- a/zuul.d/scenarios/prometheus-opensearch.yaml +++ b/zuul.d/scenarios/prometheus-opensearch.yaml @@ -38,6 +38,11 @@ parent: kolla-ansible-prometheus-opensearch-base nodeset: kolla-ansible-rocky-10-8GB +- job: + name: kolla-ansible-rocky-10-prometheus-opensearch-upgrade + parent: kolla-ansible-rocky-10-prometheus-opensearch + nodeset: kolla-ansible-rocky-10-8GB + - job: name: kolla-ansible-ubuntu-noble-prometheus-opensearch parent: kolla-ansible-prometheus-opensearch-base @@ -57,5 +62,6 @@ - kolla-ansible-debian-bookworm-prometheus-opensearch - kolla-ansible-debian-bookworm-prometheus-opensearch-upgrade - kolla-ansible-rocky-10-prometheus-opensearch + - kolla-ansible-rocky-10-prometheus-opensearch-upgrade - kolla-ansible-ubuntu-noble-prometheus-opensearch - kolla-ansible-ubuntu-noble-prometheus-opensearch-upgrade