Properly apply always tag to install_defaults

In order to complete a playbook successfully we rely on having
deploy-type specific variables, which are provided by install_defaults
role.

This used to be a simple include_vars statement instead, which was
always executed with any tags, but it's not a case now with inlcude_role
where we should explicitly take care about always running the role
regardless of tags provided.

Change-Id: I7a7112dd6a7c3a360dc6c0d206a855c220a027a6
This commit is contained in:
Dmitriy Rabotyagov 2024-07-25 15:58:33 +02:00
parent dec6ed2209
commit 0053e7c385
38 changed files with 217 additions and 0 deletions

View File

@ -29,6 +29,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
- name: Gather additional facts for monitor_address_block - name: Gather additional facts for monitor_address_block
include_tasks: "common-tasks/gather-hardware-facts.yml" include_tasks: "common-tasks/gather-hardware-facts.yml"
@ -140,6 +145,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
- name: Gather memory facts - name: Gather memory facts
include_tasks: "common-tasks/gather-hardware-facts.yml" include_tasks: "common-tasks/gather-hardware-facts.yml"
@ -200,6 +210,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
- name: Gather memory facts - name: Gather memory facts
include_tasks: "common-tasks/gather-hardware-facts.yml" include_tasks: "common-tasks/gather-hardware-facts.yml"

View File

@ -29,6 +29,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
- name: Gather ceph-mon facts - name: Gather ceph-mon facts
action: setup action: setup

View File

@ -33,6 +33,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
- name: Importing ceph-server tasks - name: Importing ceph-server tasks
import_tasks: common-tasks/ceph-server.yml import_tasks: common-tasks/ceph-server.yml

View File

@ -30,6 +30,8 @@
import_role: import_role:
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method | default('source') }}" defaults_from: "{{ install_method | default('source') }}"
tags:
- always
- name: Add service to the keystone service catalog - name: Add service to the keystone service catalog
openstack.cloud.catalog_service: openstack.cloud.catalog_service:

View File

@ -25,6 +25,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service

View File

@ -25,6 +25,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service

View File

@ -22,6 +22,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
- name: Add hosts to dynamic inventory group - name: Add hosts to dynamic inventory group
group_by: group_by:
@ -52,6 +57,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
roles: roles:
- role: "lxc_container_create" - role: "lxc_container_create"
post_tasks: post_tasks:
@ -84,6 +94,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
roles: roles:
- role: "openstack_hosts" - role: "openstack_hosts"
is_container: true is_container: true

View File

@ -55,6 +55,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
- name: Check for a supported Operating System - name: Check for a supported Operating System
assert: assert:

View File

@ -21,6 +21,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
- name: Include openstack_resources role - name: Include openstack_resources role
ansible.builtin.include_role: ansible.builtin.include_role:

View File

@ -44,6 +44,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service
# restart do not cause an unexpected outage, we drain # restart do not cause an unexpected outage, we drain

View File

@ -48,6 +48,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
- name: Disabling haproxy backends - name: Disabling haproxy backends
include_role: include_role:

View File

@ -44,6 +44,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service
# restart do not cause an unexpected outage, we drain # restart do not cause an unexpected outage, we drain

View File

@ -44,6 +44,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service
# restart do not cause an unexpected outage, we drain # restart do not cause an unexpected outage, we drain

View File

@ -34,6 +34,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
- name: Including container-setup tasks - name: Including container-setup tasks
include_role: include_role:

View File

@ -45,6 +45,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service
# restart do not cause an unexpected outage, we drain # restart do not cause an unexpected outage, we drain

View File

@ -47,6 +47,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service
# restart do not cause an unexpected outage, we drain # restart do not cause an unexpected outage, we drain

View File

@ -44,6 +44,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service
# restart do not cause an unexpected outage, we drain # restart do not cause an unexpected outage, we drain

View File

@ -44,6 +44,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service
# restart do not cause an unexpected outage, we drain # restart do not cause an unexpected outage, we drain

View File

@ -44,6 +44,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service
# restart do not cause an unexpected outage, we drain # restart do not cause an unexpected outage, we drain

View File

@ -44,6 +44,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service
# restart do not cause an unexpected outage, we drain # restart do not cause an unexpected outage, we drain

View File

@ -44,6 +44,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service
# restart do not cause an unexpected outage, we drain # restart do not cause an unexpected outage, we drain

View File

@ -31,6 +31,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
roles: roles:
- role: "openstack_openrc" - role: "openstack_openrc"
@ -75,6 +80,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service
@ -148,6 +158,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
- name: Refresh local facts - name: Refresh local facts
setup: setup:

View File

@ -47,6 +47,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service
# restart do not cause an unexpected outage, we drain # restart do not cause an unexpected outage, we drain

View File

@ -43,6 +43,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
- name: Gather additional facts - name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml" include_tasks: "common-tasks/gather-hardware-facts.yml"

View File

@ -64,6 +64,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
- name: Gather additional facts - name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml" include_tasks: "common-tasks/gather-hardware-facts.yml"

View File

@ -44,6 +44,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service

View File

@ -57,6 +57,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# Enable execution of ceph_client on the nova compute hosts if cinder RBD # 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 # backends are used. This is necessary to ensure that volume-backed Nova

View File

@ -44,6 +44,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service

View File

@ -44,6 +44,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service

View File

@ -30,6 +30,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
- name: End playbook - name: End playbook
meta: end_play meta: end_play

View File

@ -44,6 +44,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
- name: Including container-setup tasks - name: Including container-setup tasks
include_role: include_role:

View File

@ -42,6 +42,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
- name: Including container-setup tasks - name: Including container-setup tasks
include_role: include_role:

View File

@ -25,6 +25,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
roles: roles:
- role: "os_swift" - role: "os_swift"
swift_do_setup: False swift_do_setup: False

View File

@ -44,6 +44,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service

View File

@ -33,6 +33,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
- name: End playbook - name: End playbook
meta: end_play meta: end_play

View File

@ -47,6 +47,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
# In order to ensure that any container, software or # In order to ensure that any container, software or
# config file changes which causes a container/service # config file changes which causes a container/service

View File

@ -78,6 +78,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
roles: roles:
- role: "repo_server" - role: "repo_server"
environment: "{{ deployment_environment_variables | default({}) }}" environment: "{{ deployment_environment_variables | default({}) }}"

View File

@ -51,6 +51,11 @@
name: openstack.osa.install_defaults name: openstack.osa.install_defaults
defaults_from: "{{ install_method }}" defaults_from: "{{ install_method }}"
public: true public: true
apply:
tags:
- always
tags:
- always
- name: Including container-setup tasks - name: Including container-setup tasks
include_role: include_role: