From 71e9c603b85249301eab1337d7fadb58bde95a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Tue, 27 Oct 2020 19:51:46 +0100 Subject: [PATCH] Do not set 'always' tag where unnecessary Makes 'import_tasks' not change behaviour compared to 'include_tasks'. Change-Id: I600be7c3bd763b3b924bd4a45b4e7b4dca7a33e3 --- ansible/roles/aodh/tasks/register.yml | 1 - ansible/roles/barbican/tasks/register.yml | 1 - ansible/roles/blazar/tasks/register.yml | 1 - ansible/roles/ceilometer/tasks/register.yml | 1 - ansible/roles/cinder/tasks/register.yml | 1 - ansible/roles/cloudkitty/tasks/register.yml | 1 - ansible/roles/cyborg/tasks/register.yml | 1 - ansible/roles/designate/tasks/register.yml | 1 - ansible/roles/freezer/tasks/register.yml | 1 - ansible/roles/glance/tasks/register.yml | 1 - ansible/roles/gnocchi/tasks/register.yml | 1 - ansible/roles/heat/tasks/register.yml | 1 - ansible/roles/ironic/tasks/register.yml | 1 - ansible/roles/karbor/tasks/register.yml | 1 - ansible/roles/keystone/tasks/register.yml | 1 - ansible/roles/kuryr/tasks/register.yml | 1 - ansible/roles/magnum/tasks/register.yml | 1 - ansible/roles/manila/tasks/register.yml | 1 - ansible/roles/masakari/tasks/register.yml | 1 - ansible/roles/mistral/tasks/register.yml | 1 - ansible/roles/monasca/tasks/register.yml | 1 - ansible/roles/murano/tasks/register.yml | 1 - ansible/roles/neutron/tasks/register.yml | 1 - ansible/roles/nova-cell/tasks/rabbitmq.yml | 1 - ansible/roles/nova/tasks/register.yml | 1 - ansible/roles/octavia/tasks/register.yml | 1 - ansible/roles/panko/tasks/register.yml | 1 - ansible/roles/placement/tasks/register.yml | 1 - ansible/roles/qinling/tasks/register.yml | 1 - ansible/roles/sahara/tasks/register.yml | 1 - ansible/roles/searchlight/tasks/register.yml | 1 - ansible/roles/senlin/tasks/register.yml | 1 - ansible/roles/solum/tasks/register.yml | 1 - ansible/roles/swift/tasks/register.yml | 1 - ansible/roles/tacker/tasks/register.yml | 1 - ansible/roles/trove/tasks/register.yml | 1 - ansible/roles/vitrage/tasks/register.yml | 1 - ansible/roles/watcher/tasks/register.yml | 1 - ansible/roles/zun/tasks/register.yml | 1 - 39 files changed, 39 deletions(-) diff --git a/ansible/roles/aodh/tasks/register.yml b/ansible/roles/aodh/tasks/register.yml index 3a97d70b3b..59b4bc4c4a 100644 --- a/ansible/roles/aodh/tasks/register.yml +++ b/ansible/roles/aodh/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_aodh_auth }}" service_ks_register_services: "{{ aodh_ks_services }}" service_ks_register_users: "{{ aodh_ks_users }}" - tags: always diff --git a/ansible/roles/barbican/tasks/register.yml b/ansible/roles/barbican/tasks/register.yml index 0ceb37f914..40eae43b09 100644 --- a/ansible/roles/barbican/tasks/register.yml +++ b/ansible/roles/barbican/tasks/register.yml @@ -6,4 +6,3 @@ service_ks_register_services: "{{ barbican_ks_services }}" service_ks_register_users: "{{ barbican_ks_users }}" service_ks_register_roles: "{{ barbican_ks_roles }}" - tags: always diff --git a/ansible/roles/blazar/tasks/register.yml b/ansible/roles/blazar/tasks/register.yml index 515bac5a30..73c675d4d5 100644 --- a/ansible/roles/blazar/tasks/register.yml +++ b/ansible/roles/blazar/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_blazar_auth }}" service_ks_register_services: "{{ blazar_ks_services }}" service_ks_register_users: "{{ blazar_ks_users }}" - tags: always diff --git a/ansible/roles/ceilometer/tasks/register.yml b/ansible/roles/ceilometer/tasks/register.yml index 2a3225c9e4..de5a675022 100644 --- a/ansible/roles/ceilometer/tasks/register.yml +++ b/ansible/roles/ceilometer/tasks/register.yml @@ -4,7 +4,6 @@ vars: service_ks_register_auth: "{{ openstack_ceilometer_auth }}" service_ks_register_users: "{{ ceilometer_ks_users }}" - tags: always - name: Associate the ResellerAdmin role and ceilometer user become: true diff --git a/ansible/roles/cinder/tasks/register.yml b/ansible/roles/cinder/tasks/register.yml index 6ac5939430..86511bc411 100644 --- a/ansible/roles/cinder/tasks/register.yml +++ b/ansible/roles/cinder/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_cinder_auth }}" service_ks_register_services: "{{ cinder_ks_services }}" service_ks_register_users: "{{ cinder_ks_users }}" - tags: always diff --git a/ansible/roles/cloudkitty/tasks/register.yml b/ansible/roles/cloudkitty/tasks/register.yml index fa45947e2f..a3c42cd6e1 100644 --- a/ansible/roles/cloudkitty/tasks/register.yml +++ b/ansible/roles/cloudkitty/tasks/register.yml @@ -6,4 +6,3 @@ service_ks_register_services: "{{ cloudkitty_ks_services }}" service_ks_register_users: "{{ cloudkitty_ks_users }}" service_ks_register_roles: "{{ cloudkitty_ks_roles }}" - tags: always diff --git a/ansible/roles/cyborg/tasks/register.yml b/ansible/roles/cyborg/tasks/register.yml index c5b54f96fa..5bd1c954cf 100644 --- a/ansible/roles/cyborg/tasks/register.yml +++ b/ansible/roles/cyborg/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_cyborg_auth }}" service_ks_register_services: "{{ cyborg_ks_services }}" service_ks_register_users: "{{ cyborg_ks_users }}" - tags: always diff --git a/ansible/roles/designate/tasks/register.yml b/ansible/roles/designate/tasks/register.yml index f73ebabba9..6bb2863c81 100644 --- a/ansible/roles/designate/tasks/register.yml +++ b/ansible/roles/designate/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_designate_auth }}" service_ks_register_services: "{{ designate_ks_services }}" service_ks_register_users: "{{ designate_ks_users }}" - tags: always diff --git a/ansible/roles/freezer/tasks/register.yml b/ansible/roles/freezer/tasks/register.yml index c27427986a..da9e975ee1 100644 --- a/ansible/roles/freezer/tasks/register.yml +++ b/ansible/roles/freezer/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_freezer_auth }}" service_ks_register_services: "{{ freezer_ks_services }}" service_ks_register_users: "{{ freezer_ks_users }}" - tags: always diff --git a/ansible/roles/glance/tasks/register.yml b/ansible/roles/glance/tasks/register.yml index 7a1a715b4d..49a6aacfcf 100644 --- a/ansible/roles/glance/tasks/register.yml +++ b/ansible/roles/glance/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_glance_auth }}" service_ks_register_services: "{{ glance_ks_services }}" service_ks_register_users: "{{ glance_ks_users }}" - tags: always diff --git a/ansible/roles/gnocchi/tasks/register.yml b/ansible/roles/gnocchi/tasks/register.yml index dcfbb03441..7fd7534ef7 100644 --- a/ansible/roles/gnocchi/tasks/register.yml +++ b/ansible/roles/gnocchi/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_gnocchi_auth }}" service_ks_register_services: "{{ gnocchi_ks_services }}" service_ks_register_users: "{{ gnocchi_ks_users }}" - tags: always diff --git a/ansible/roles/heat/tasks/register.yml b/ansible/roles/heat/tasks/register.yml index aea43c7add..3482e4d7ca 100644 --- a/ansible/roles/heat/tasks/register.yml +++ b/ansible/roles/heat/tasks/register.yml @@ -7,4 +7,3 @@ service_ks_register_users: "{{ heat_ks_users }}" service_ks_register_roles: "{{ heat_ks_roles }}" service_ks_register_user_roles: "{{ heat_ks_user_roles }}" - tags: always diff --git a/ansible/roles/ironic/tasks/register.yml b/ansible/roles/ironic/tasks/register.yml index 044b267ee4..5d19d89b99 100644 --- a/ansible/roles/ironic/tasks/register.yml +++ b/ansible/roles/ironic/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_ironic_auth }}" service_ks_register_services: "{{ ironic_ks_services }}" service_ks_register_users: "{{ ironic_ks_users }}" - tags: always diff --git a/ansible/roles/karbor/tasks/register.yml b/ansible/roles/karbor/tasks/register.yml index 4c9e3d2919..8002a69aed 100644 --- a/ansible/roles/karbor/tasks/register.yml +++ b/ansible/roles/karbor/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_karbor_auth }}" service_ks_register_services: "{{ karbor_ks_services }}" service_ks_register_users: "{{ karbor_ks_users }}" - tags: always diff --git a/ansible/roles/keystone/tasks/register.yml b/ansible/roles/keystone/tasks/register.yml index 51cc531799..d79bdce8c8 100644 --- a/ansible/roles/keystone/tasks/register.yml +++ b/ansible/roles/keystone/tasks/register.yml @@ -16,7 +16,6 @@ vars: service_ks_register_auth: "{{ openstack_keystone_auth }}" service_ks_register_services: "{{ keystone_ks_services }}" - tags: always run_once: True - name: Creating default user role diff --git a/ansible/roles/kuryr/tasks/register.yml b/ansible/roles/kuryr/tasks/register.yml index a3b46bcef0..50e15f0e12 100644 --- a/ansible/roles/kuryr/tasks/register.yml +++ b/ansible/roles/kuryr/tasks/register.yml @@ -4,4 +4,3 @@ vars: service_ks_register_auth: "{{ openstack_kuryr_auth }}" service_ks_register_users: "{{ kuryr_ks_users }}" - tags: always diff --git a/ansible/roles/magnum/tasks/register.yml b/ansible/roles/magnum/tasks/register.yml index 30352e149c..a258d3a1d9 100644 --- a/ansible/roles/magnum/tasks/register.yml +++ b/ansible/roles/magnum/tasks/register.yml @@ -5,7 +5,6 @@ service_ks_register_auth: "{{ openstack_magnum_auth }}" service_ks_register_services: "{{ magnum_ks_services }}" service_ks_register_users: "{{ magnum_ks_users }}" - tags: always - name: Creating Magnum trustee domain become: true diff --git a/ansible/roles/manila/tasks/register.yml b/ansible/roles/manila/tasks/register.yml index e3fca2540b..d8af77c0f5 100644 --- a/ansible/roles/manila/tasks/register.yml +++ b/ansible/roles/manila/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_manila_auth }}" service_ks_register_services: "{{ manila_ks_services }}" service_ks_register_users: "{{ manila_ks_users }}" - tags: always diff --git a/ansible/roles/masakari/tasks/register.yml b/ansible/roles/masakari/tasks/register.yml index 6ee986d95f..9f2413ad77 100644 --- a/ansible/roles/masakari/tasks/register.yml +++ b/ansible/roles/masakari/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_masakari_auth }}" service_ks_register_services: "{{ masakari_ks_services }}" service_ks_register_users: "{{ masakari_ks_users }}" - tags: always diff --git a/ansible/roles/mistral/tasks/register.yml b/ansible/roles/mistral/tasks/register.yml index 76f1640aab..c0f0822fae 100644 --- a/ansible/roles/mistral/tasks/register.yml +++ b/ansible/roles/mistral/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_mistral_auth }}" service_ks_register_services: "{{ mistral_ks_services }}" service_ks_register_users: "{{ mistral_ks_users }}" - tags: always diff --git a/ansible/roles/monasca/tasks/register.yml b/ansible/roles/monasca/tasks/register.yml index afab0c7699..ddc05f3254 100644 --- a/ansible/roles/monasca/tasks/register.yml +++ b/ansible/roles/monasca/tasks/register.yml @@ -6,4 +6,3 @@ service_ks_register_services: "{{ monasca_ks_services }}" service_ks_register_users: "{{ monasca_ks_users }}" service_ks_register_roles: "{{ monasca_ks_roles }}" - tags: always diff --git a/ansible/roles/murano/tasks/register.yml b/ansible/roles/murano/tasks/register.yml index f27831dc21..2b10a818a0 100644 --- a/ansible/roles/murano/tasks/register.yml +++ b/ansible/roles/murano/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_murano_auth }}" service_ks_register_services: "{{ murano_ks_services }}" service_ks_register_users: "{{ murano_ks_users }}" - tags: always diff --git a/ansible/roles/neutron/tasks/register.yml b/ansible/roles/neutron/tasks/register.yml index 5495698084..1dc2e4dbc0 100644 --- a/ansible/roles/neutron/tasks/register.yml +++ b/ansible/roles/neutron/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_neutron_auth }}" service_ks_register_services: "{{ neutron_ks_services }}" service_ks_register_users: "{{ neutron_ks_users }}" - tags: always diff --git a/ansible/roles/nova-cell/tasks/rabbitmq.yml b/ansible/roles/nova-cell/tasks/rabbitmq.yml index 3be1ff42be..6545c54675 100644 --- a/ansible/roles/nova-cell/tasks/rabbitmq.yml +++ b/ansible/roles/nova-cell/tasks/rabbitmq.yml @@ -25,4 +25,3 @@ nova_cell_rpc_rabbitmq_users != nova_cell_notify_rabbitmq_users when: nova_cell_rpc_transport == 'rabbit' - tags: always diff --git a/ansible/roles/nova/tasks/register.yml b/ansible/roles/nova/tasks/register.yml index a6ed79ffb1..a9c7cfaf61 100644 --- a/ansible/roles/nova/tasks/register.yml +++ b/ansible/roles/nova/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_nova_auth }}" service_ks_register_services: "{{ nova_ks_services }}" service_ks_register_users: "{{ nova_ks_users }}" - tags: always diff --git a/ansible/roles/octavia/tasks/register.yml b/ansible/roles/octavia/tasks/register.yml index d96de5656d..f8e9fe1148 100644 --- a/ansible/roles/octavia/tasks/register.yml +++ b/ansible/roles/octavia/tasks/register.yml @@ -5,7 +5,6 @@ service_ks_register_auth: "{{ openstack_octavia_auth }}" service_ks_register_services: "{{ octavia_ks_services }}" service_ks_register_users: "{{ octavia_ks_users }}" - tags: always - name: "Adding admin role to octavia user in {{ octavia_service_auth_project }} project" become: true diff --git a/ansible/roles/panko/tasks/register.yml b/ansible/roles/panko/tasks/register.yml index 75a881c5d0..06efc28f45 100644 --- a/ansible/roles/panko/tasks/register.yml +++ b/ansible/roles/panko/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_panko_auth }}" service_ks_register_services: "{{ panko_ks_services }}" service_ks_register_users: "{{ panko_ks_users }}" - tags: always diff --git a/ansible/roles/placement/tasks/register.yml b/ansible/roles/placement/tasks/register.yml index b136c729d7..76db452abd 100644 --- a/ansible/roles/placement/tasks/register.yml +++ b/ansible/roles/placement/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_placement_auth }}" service_ks_register_services: "{{ placement_ks_services }}" service_ks_register_users: "{{ placement_ks_users }}" - tags: always diff --git a/ansible/roles/qinling/tasks/register.yml b/ansible/roles/qinling/tasks/register.yml index 661fcc79a6..02d055b33f 100644 --- a/ansible/roles/qinling/tasks/register.yml +++ b/ansible/roles/qinling/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_qinling_auth }}" service_ks_register_services: "{{ qinling_ks_services }}" service_ks_register_users: "{{ qinling_ks_users }}" - tags: always diff --git a/ansible/roles/sahara/tasks/register.yml b/ansible/roles/sahara/tasks/register.yml index 8492e9d550..17c71fae28 100644 --- a/ansible/roles/sahara/tasks/register.yml +++ b/ansible/roles/sahara/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_sahara_auth }}" service_ks_register_services: "{{ sahara_ks_services }}" service_ks_register_users: "{{ sahara_ks_users }}" - tags: always diff --git a/ansible/roles/searchlight/tasks/register.yml b/ansible/roles/searchlight/tasks/register.yml index 9613cb5ed3..6750024289 100644 --- a/ansible/roles/searchlight/tasks/register.yml +++ b/ansible/roles/searchlight/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_searchlight_auth }}" service_ks_register_services: "{{ searchlight_ks_services }}" service_ks_register_users: "{{ searchlight_ks_users }}" - tags: always diff --git a/ansible/roles/senlin/tasks/register.yml b/ansible/roles/senlin/tasks/register.yml index 21267ea342..8a2d48d20d 100644 --- a/ansible/roles/senlin/tasks/register.yml +++ b/ansible/roles/senlin/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_senlin_auth }}" service_ks_register_services: "{{ senlin_ks_services }}" service_ks_register_users: "{{ senlin_ks_users }}" - tags: always diff --git a/ansible/roles/solum/tasks/register.yml b/ansible/roles/solum/tasks/register.yml index 3fd4b0f7e3..fb320049a4 100644 --- a/ansible/roles/solum/tasks/register.yml +++ b/ansible/roles/solum/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_solum_auth }}" service_ks_register_services: "{{ solum_ks_services }}" service_ks_register_users: "{{ solum_ks_users }}" - tags: always diff --git a/ansible/roles/swift/tasks/register.yml b/ansible/roles/swift/tasks/register.yml index e17de92986..d35b0b9b5c 100644 --- a/ansible/roles/swift/tasks/register.yml +++ b/ansible/roles/swift/tasks/register.yml @@ -5,7 +5,6 @@ service_ks_register_auth: "{{ openstack_swift_auth }}" service_ks_register_services: "{{ swift_ks_services }}" service_ks_register_users: "{{ swift_ks_users }}" - tags: always - name: Creating the ResellerAdmin role become: true diff --git a/ansible/roles/tacker/tasks/register.yml b/ansible/roles/tacker/tasks/register.yml index 8ae3eb36c2..2c1f3bbf23 100644 --- a/ansible/roles/tacker/tasks/register.yml +++ b/ansible/roles/tacker/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_tacker_auth }}" service_ks_register_services: "{{ tacker_ks_services }}" service_ks_register_users: "{{ tacker_ks_users }}" - tags: always diff --git a/ansible/roles/trove/tasks/register.yml b/ansible/roles/trove/tasks/register.yml index 21d8b6d67d..c8d0b39113 100644 --- a/ansible/roles/trove/tasks/register.yml +++ b/ansible/roles/trove/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_trove_auth }}" service_ks_register_services: "{{ trove_ks_services }}" service_ks_register_users: "{{ trove_ks_users }}" - tags: always diff --git a/ansible/roles/vitrage/tasks/register.yml b/ansible/roles/vitrage/tasks/register.yml index bb8151133c..6bbd0561d3 100644 --- a/ansible/roles/vitrage/tasks/register.yml +++ b/ansible/roles/vitrage/tasks/register.yml @@ -5,7 +5,6 @@ service_ks_register_auth: "{{ openstack_vitrage_auth }}" service_ks_register_services: "{{ vitrage_ks_services }}" service_ks_register_users: "{{ vitrage_ks_users }}" - tags: always - name: Adding vitrage user into admin project become: true diff --git a/ansible/roles/watcher/tasks/register.yml b/ansible/roles/watcher/tasks/register.yml index be1fe0c113..488b5c09f1 100644 --- a/ansible/roles/watcher/tasks/register.yml +++ b/ansible/roles/watcher/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_watcher_auth }}" service_ks_register_services: "{{ watcher_ks_services }}" service_ks_register_users: "{{ watcher_ks_users }}" - tags: always diff --git a/ansible/roles/zun/tasks/register.yml b/ansible/roles/zun/tasks/register.yml index 207ce21da7..afc840e7f0 100644 --- a/ansible/roles/zun/tasks/register.yml +++ b/ansible/roles/zun/tasks/register.yml @@ -5,4 +5,3 @@ service_ks_register_auth: "{{ openstack_zun_auth }}" service_ks_register_services: "{{ zun_ks_services }}" service_ks_register_users: "{{ zun_ks_users }}" - tags: always