Remove service-specific tags from service playbooks

This removes service-specific tags like 'nova' as they are confusing in their current state, and only appear useful if run using the setup-openstack playbook. The tags restrict which pre/post tasks run, but don't prevent the related roles from running. This causes issues such as: calling setup-openstack with a 'nova' tag would not run the 'haproxy-service-config' step, and running os-nova-install with a 'nova-config' tag wouldn't run HAProxy maintenance steps. Change-Id: I4dd6350cb8eb211814a1d6055e674065bf015f4c
2024-05-08 13:34:56 +01:00 · 2024-05-08 13:34:56 +01:00 · 5f278ee02e
commit 5f278ee02e
parent f8d1d82a0a
32 changed files with 99 additions and 76 deletions
--- a/playbooks/common-playbooks/cinder.yml
+++ b/playbooks/common-playbooks/cinder.yml
@ -21,8 +21,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "../defaults/{{ install_method }}_install.yml"
-  tags:
-    - cinder
  pre_tasks:

    # In order to ensure that any container, software or
@ -37,6 +35,8 @@
      when:
        - "'cinder_api' in group_names"
        - "groups['cinder_api'] | length > 1"
+      tags:
+        - always

    - name: Determine storage bridge IP address
      include_tasks: ../common-tasks/dynamic-address-fact.yml
@ -118,3 +118,5 @@
      when:
        - "'cinder_api' in group_names"
        - "groups['cinder_api'] | length > 1"
+      tags:
+        - always
--- a/playbooks/common-playbooks/neutron.yml
+++ b/playbooks/common-playbooks/neutron.yml
@ -21,8 +21,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "../defaults/{{ install_method }}_install.yml"
-  tags:
-    - neutron
  pre_tasks:

    # In order to ensure that any container, software or
@ -37,6 +35,8 @@
      when:
        - "'neutron_server' in group_names"
        - "groups['neutron_server'] | length > 1"
+      tags:
+        - always

    - name: Determine tunnel bridge IP address
      include_tasks: ../common-tasks/dynamic-address-fact.yml
@ -91,3 +91,5 @@
      when:
        - "'neutron_server' in group_names"
        - "groups['neutron_server'] | length > 1"
+      tags:
+        - always
--- a/playbooks/os-adjutant-install.yml
+++ b/playbooks/os-adjutant-install.yml
@ -40,8 +40,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - adjutant
  pre_tasks:
    # In order to ensure that any container, software or
    # config file changes which causes a container/service
@ -55,6 +53,8 @@
      when:
        - "'adjutant_api' in group_names"
        - "groups['adjutant_api'] | length > 1"
+      tags:
+        - always

    - name: Including unbound-clients tasks
      include_tasks: common-tasks/unbound-clients.yml
@ -76,3 +76,5 @@
      when:
        - "'adjutant_api' in group_names"
        - "groups['adjutant_api'] | length > 1"
+      tags:
+        - always
--- a/playbooks/os-aodh-install.yml
+++ b/playbooks/os-aodh-install.yml
@ -40,8 +40,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - aodh
  pre_tasks:
    # In order to ensure that any container, software or
    # config file changes which causes a container/service
@ -55,6 +53,8 @@
      when:
        - "'aodh_api' in group_names"
        - "groups['aodh_api'] | length > 1"
+      tags:
+        - always

    - name: Including container-setup tasks
      include_role:
@ -81,3 +81,5 @@
      when:
        - "'aodh_api' in group_names"
        - "groups['aodh_api'] | length > 1"
+      tags:
+        - always
--- a/playbooks/os-barbican-install.yml
+++ b/playbooks/os-barbican-install.yml
@ -40,8 +40,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - barbican
  pre_tasks:
    # In order to ensure that any container, software or
    # config file changes which causes a container/service
@ -55,6 +53,8 @@
      when:
        - "'barbican_api' in group_names"
        - "groups['barbican_api'] | length > 1"
+      tags:
+        - always

    - name: Including container-setup tasks
      include_role:
@ -80,3 +80,5 @@
      when:
        - "'barbican_api' in group_names"
        - "groups['barbican_api'] | length > 1"
+      tags:
+        - always
--- a/playbooks/os-blazar-install.yml
+++ b/playbooks/os-blazar-install.yml
@ -40,8 +40,6 @@
  user: root
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - blazar
  pre_tasks:
    # In order to ensure that any container, software or
    # config file changes which causes a container/service
@ -55,6 +53,8 @@
      when:
        - "'blazar_api' in group_names"
        - "groups['blazar_api'] | length > 1"
+      tags:
+        - always

    - name: Including container-setup tasks
      include_role:
@ -84,3 +84,5 @@
      when:
        - "'blazar_api' in group_names"
        - "groups['blazar_api'] | length > 1"
+      tags:
+        - always
--- a/playbooks/os-ceilometer-install.yml
+++ b/playbooks/os-ceilometer-install.yml
@ -44,5 +44,3 @@
    - role: "os_ceilometer"

  environment: "{{ deployment_environment_variables | default({}) }}"
-  tags:
-    - ceilometer
--- a/playbooks/os-cloudkitty-install.yml
+++ b/playbooks/os-cloudkitty-install.yml
@ -41,8 +41,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - cloudkitty
  pre_tasks:
    # In order to ensure that any container, software or
    # config file changes which causes a container/service
@ -56,6 +54,8 @@
      when:
        - "'cloudkitty_api' in group_names"
        - "groups['cloudkitty_api'] | length > 1"
+      tags:
+        - always

    - name: Including unbound-clients tasks
      include_tasks: common-tasks/unbound-clients.yml
@ -77,3 +77,5 @@
      when:
        - "'cloudkitty_api' in group_names"
        - "groups['cloudkitty_api'] | length > 1"
+      tags:
+        - always
--- a/playbooks/os-designate-install.yml
+++ b/playbooks/os-designate-install.yml
@ -43,8 +43,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - designate
  pre_tasks:
    # In order to ensure that any container, software or
    # config file changes which causes a container/service
@ -58,6 +56,8 @@
      when:
        - "'designate_api' in group_names"
        - "groups['designate_api'] | length > 1"
+      tags:
+        - always

    - name: Including container-setup tasks
      include_role:
@ -83,3 +83,5 @@
      when:
        - "'designate_api' in group_names"
        - "groups['designate_api'] | length > 1"
+      tags:
+        - always
--- a/playbooks/os-glance-install.yml
+++ b/playbooks/os-glance-install.yml
@ -40,8 +40,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - glance
  pre_tasks:
    # In order to ensure that any container, software or
    # config file changes which causes a container/service
@ -55,6 +53,8 @@
      when:
        - "'glance_api' in group_names"
        - "groups['glance_api'] | length > 1"
+      tags:
+        - always

    - name: Configure container (local storage bind mount from host)
      include_role:
@ -96,3 +96,5 @@
      when:
        - "'glance_api' in group_names"
        - "groups['glance_api'] | length > 1"
+      tags:
+        - always
--- a/playbooks/os-gnocchi-install.yml
+++ b/playbooks/os-gnocchi-install.yml
@ -40,8 +40,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - gnocchi
  pre_tasks:
    # In order to ensure that any container, software or
    # config file changes which causes a container/service
@ -55,6 +53,8 @@
      when:
        - "'gnocchi_all' in group_names"
        - "groups['gnocchi_all'] | length > 1"
+      tags:
+        - always

    - name: Including container-setup tasks
      include_role:
@ -84,3 +84,5 @@
      when:
        - "'gnocchi_all' in group_names"
        - "groups['gnocchi_all'] | length > 1"
+      tags:
+        - always
--- a/playbooks/os-heat-install.yml
+++ b/playbooks/os-heat-install.yml
@ -38,8 +38,6 @@
  serial: "{{ heat_serial | default(['1','100%']) }}"
  user: root
  environment: "{{ deployment_environment_variables | default({}) }}"
-  tags:
-    - heat
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
  pre_tasks:
@ -55,6 +53,8 @@
      when:
        - "'heat_api' in group_names"
        - "groups['heat_api'] | length > 1"
+      tags:
+        - always

    - name: Including container-setup tasks
      include_role:
@ -83,3 +83,5 @@
      when:
        - "'heat_api' in group_names"
        - "groups['heat_api'] | length > 1"
+      tags:
+        - always
--- a/playbooks/os-horizon-install.yml
+++ b/playbooks/os-horizon-install.yml
@ -40,8 +40,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - horizon
  pre_tasks:
    # In order to ensure that any container, software or
    # config file changes which causes a container/service
@ -55,6 +53,8 @@
      when:
        - "'horizon_all' in group_names"
        - "groups['horizon_all'] | length > 1"
+      tags:
+        - always

    - name: Including container-setup tasks
      include_role:
@ -82,3 +82,5 @@
      when:
        - "'horizon_all' in group_names"
        - "groups['horizon_all'] | length > 1"
+      tags:
+        - always
--- a/playbooks/os-ironic-install.yml
+++ b/playbooks/os-ironic-install.yml
@ -40,8 +40,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - ironic
  pre_tasks:
    # In order to ensure that any container, software or
    # config file changes which causes a container/service
@ -55,6 +53,8 @@
      when:
        - "'ironic_api' in group_names"
        - "groups['ironic_api'] | length > 1"
+      tags:
+        - always

    - name: Including container-setup tasks
      include_role:
@ -83,3 +83,5 @@
      when:
        - "'ironic_api' in group_names"
        - "groups['ironic_api'] | length > 1"
+      tags:
+        - always
--- a/playbooks/os-keystone-install.yml
+++ b/playbooks/os-keystone-install.yml
@ -49,8 +49,6 @@
      include_role:
        name: os_keystone
        tasks_from: main_pre.yml
-  tags:
-    - keystone

 - name: Configure haproxy services
  import_playbook: openstack.osa.haproxy_service_config
@ -69,8 +67,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - keystone
  pre_tasks:
    # In order to ensure that any container, software or
    # config file changes which causes a container/service
@ -84,6 +80,8 @@
      when:
        - "'keystone_all' in group_names"
        - "groups['keystone_all'] | length > 1"
+      tags:
+        - always

    - name: Configure container
      include_role:
@ -116,6 +114,8 @@
      when:
        - "'keystone_all' in group_names"
        - "groups['keystone_all'] | length > 1"
+      tags:
+        - always

 # These facts are set against the deployment host to ensure that
 # they are fast to access. This is done in preference to setting
@ -128,8 +128,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - keystone
  tasks:
    - name: Refresh local facts
      setup:
@ -194,8 +192,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - keystone
  tasks:
    - name: "Post configure SP/IDP"
      include_role:
--- a/playbooks/os-magnum-install.yml
+++ b/playbooks/os-magnum-install.yml
@ -43,8 +43,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - magnum
  pre_tasks:
    # In order to ensure that any container, software or
    # config file changes which causes a container/service
@ -58,6 +56,8 @@
      when:
        - "'magnum_all' in group_names"
        - "groups['magnum_all'] | length > 1"
+      tags:
+        - always

    - name: Including container-setup tasks
      include_role:
@ -84,3 +84,5 @@
      when:
        - "'magnum_all' in group_names"
        - "groups['magnum_all'] | length > 1"
+      tags:
+        - always
--- a/playbooks/os-manila-install.yml
+++ b/playbooks/os-manila-install.yml
@ -39,8 +39,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - manila
  pre_tasks:
    - name: Gather additional facts
      include_tasks: "common-tasks/gather-hardware-facts.yml"
@ -63,6 +61,8 @@
      when:
        - "'manila_api' in group_names"
        - "groups['manila_api'] | length > 1"
+      tags:
+        - always

    - name: Including unbound-clients tasks
      include_tasks: common-tasks/unbound-clients.yml
@ -84,6 +84,8 @@
      when:
        - "'manila_api' in group_names"
        - "groups['manila_api'] | length > 1"
+      tags:
+        - always

 - name: Install manila data services
  hosts: manila_data:manila_share
@ -92,8 +94,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - manila

  pre_tasks:
    - name: Including unbound-clients tasks
--- a/playbooks/os-masakari-install.yml
+++ b/playbooks/os-masakari-install.yml
@ -82,6 +82,8 @@
      when:
        - "'masakari_api' in group_names"
        - "groups['masakari_api'] | length > 1"
+      tags:
+        - always

    - name: Including container-setup tasks
      include_role:
@ -108,7 +110,7 @@
      when:
        - "'masakari_api' in group_names"
        - "groups['masakari_api'] | length > 1"
+      tags:
+        - always

  environment: "{{ deployment_environment_variables | default({}) }}"
-  tags:
-    - masakari
--- a/playbooks/os-mistral-install.yml
+++ b/playbooks/os-mistral-install.yml
@ -40,8 +40,6 @@
  user: root
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - mistral
  pre_tasks:
    # In order to ensure that any container, software or
    # config file changes which causes a container/service
@ -55,6 +53,8 @@
      when:
        - "'mistral_all' in group_names"
        - "groups['mistral_all'] | length > 1"
+      tags:
+        - always

    - name: Including container-setup tasks
      include_role:
@ -84,3 +84,5 @@
      when:
        - "'mistral_all' in group_names"
        - "groups['mistral_all'] | length > 1"
+      tags:
+        - always
--- a/playbooks/os-neutron-install.yml
+++ b/playbooks/os-neutron-install.yml
@ -35,8 +35,6 @@
 - name: Configure Neutron dynamic host groupings
  hosts: localhost
  gather_facts: no
-  tags:
-    - neutron
  tasks:
    - name: Importing dynamic-grouping tasks
      import_tasks: common-tasks/dynamic-grouping.yml
--- a/playbooks/os-nova-install.yml
+++ b/playbooks/os-nova-install.yml
@ -53,8 +53,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - nova
  pre_tasks:
    # Enable execution of ceph_client on the nova compute hosts if cinder RBD
    # backends are used. This is necessary to ensure that volume-backed Nova
@ -88,6 +86,8 @@
        - "nova_api_metadata"
        - "nova_api_os_compute"
        - "nova_console"
+      tags:
+        - always

    - name: Configure container
      include_role:
@ -129,6 +129,8 @@
        - "nova_api_metadata"
        - "nova_api_os_compute"
        - "nova_console"
+      tags:
+        - always


 - name: Install nova compute services
@ -139,8 +141,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - nova
  pre_tasks:
    # Enable execution of ceph_client on the nova compute hosts if cinder RBD
    # backends are used. This is necessary to ensure that volume-backed Nova
@ -247,5 +247,3 @@
      import_role:
        name: os_nova
        tasks_from: nova_db_post_setup.yml
-  tags:
-    - nova
--- a/playbooks/os-octavia-install.yml
+++ b/playbooks/os-octavia-install.yml
@ -40,8 +40,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - octavia
  pre_tasks:
    # In order to ensure that any container, software or
    # config file changes which causes a container/service
@ -55,6 +53,8 @@
      when:
        - "'octavia_all' in group_names"
        - "groups['octavia_all'] | length > 1"
+      tags:
+        - always

    - name: Including container-setup tasks
      include_role:
@ -83,3 +83,5 @@
      when:
        - "'octavia_all' in group_names"
        - "groups['octavia_all'] | length > 1"
+      tags:
+        - always
--- a/playbooks/os-placement-install.yml
+++ b/playbooks/os-placement-install.yml
@ -40,8 +40,6 @@
  user: root
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - placement
  pre_tasks:
    # In order to ensure that any container, software or
    # config file changes which causes a container/service
@ -55,6 +53,8 @@
      when:
        - "'placement_all' in group_names"
        - "groups['placement_all'] | length > 1"
+      tags:
+        - always

    - name: Including container-setup tasks
      include_role:
@ -83,3 +83,5 @@
      when:
        - "'placement_all' in group_names"
        - "groups['placement_all'] | length > 1"
+      tags:
+        - always
--- a/playbooks/os-rally-install.yml
+++ b/playbooks/os-rally-install.yml
@ -26,8 +26,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - rally
  pre_tasks:
    - name: End playbook
      meta: end_play
--- a/playbooks/os-skyline-install.yml
+++ b/playbooks/os-skyline-install.yml
@ -40,8 +40,6 @@
  user: root
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - skyline
  pre_tasks:
    - name: Including container-setup tasks
      include_role:
--- a/playbooks/os-swift-install.yml
+++ b/playbooks/os-swift-install.yml
@ -57,8 +57,6 @@
      swift_do_setup: True
      swift_do_sync: True
  environment: "{{ deployment_environment_variables | default({}) }}"
-  tags:
-    - swift

 - name: Installation and setup of Swift
  hosts: swift_all
@ -69,5 +67,3 @@
      tags:
        - crontab
  environment: "{{ deployment_environment_variables | default({}) }}"
-  tags:
-    - swift
--- a/playbooks/os-swift-sync.yml
+++ b/playbooks/os-swift-sync.yml
@ -26,5 +26,3 @@
      swift_do_setup: False
      swift_do_sync: True
  environment: "{{ deployment_environment_variables | default({}) }}"
-  tags:
-    - swift
--- a/playbooks/os-tacker-install.yml
+++ b/playbooks/os-tacker-install.yml
@ -40,8 +40,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - tacker
  pre_tasks:
    # In order to ensure that any container, software or
    # config file changes which causes a container/service
--- a/playbooks/os-tempest-install.yml
+++ b/playbooks/os-tempest-install.yml
@ -42,5 +42,3 @@
        - crontab

  environment: "{{ deployment_environment_variables | default({}) }}"
-  tags:
-    - tempest
--- a/playbooks/os-trove-install.yml
+++ b/playbooks/os-trove-install.yml
@ -43,8 +43,6 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
    - "defaults/{{ install_method }}_install.yml"
-  tags:
-    - trove
  pre_tasks:
    # In order to ensure that any container, software or
    # config file changes which causes a container/service
@ -58,6 +56,8 @@
      when:
        - "'trove_api' in group_names"
        - "groups['trove_api'] | length > 1"
+      tags:
+        - always

    - name: Including container-setup tasks
      include_role:
@ -83,3 +83,5 @@
      when:
        - "'trove_api' in group_names"
        - "groups['trove_api'] | length > 1"
+      tags:
+        - always
--- a/playbooks/os-zun-install.yml
+++ b/playbooks/os-zun-install.yml
@ -69,6 +69,8 @@
      when:
        - "'zun_api' in group_names"
        - "groups['zun_api'] | length > 1"
+      tags:
+        - always

    - name: Including container-setup tasks
      include_role:
@ -95,7 +97,7 @@
      when:
        - "'zun_api' in group_names"
        - "groups['zun_api'] | length > 1"
+      tags:
+        - always

  environment: "{{ deployment_environment_variables | default({}) }}"
-  tags:
-    - zun
--- a/releasenotes/notes/remove-service-only-tags-71e512750867fe3a.yaml
+++ b/releasenotes/notes/remove-service-only-tags-71e512750867fe3a.yaml
@ -0,0 +1,7 @@
+---
+other:
+  - |
+    Tags matching service names have been removed from os-<service>-install.yml
+    playbooks. For example 'nova', 'neutron', 'cinder' etc. These tags were
+    only useful in conjunction with setup-openstack.yml, but were found to have
+    unexpected behaviour, potentially causing important tasks to be skipped.