Merge "Fix extra facts gathering with tags"

This commit is contained in:
Zuul 2022-04-03 16:01:41 +00:00 committed by Gerrit Code Review
commit 1ea48d14e2
32 changed files with 149 additions and 153 deletions

View File

@ -33,6 +33,10 @@
deployment_extra_facts_filter: "ansible_all_ipv[4|6]_addresses" deployment_extra_facts_filter: "ansible_all_ipv[4|6]_addresses"
deployment_extra_facts_subset: "!all,network" deployment_extra_facts_subset: "!all,network"
when: monitor_address_block is defined when: monitor_address_block is defined
args:
apply:
tags:
- always
tags: tags:
- always - always
@ -42,6 +46,10 @@
deployment_extra_facts_filter: "{{ 'ansible_' ~ monitor_interface | replace('-','_') }}" deployment_extra_facts_filter: "{{ 'ansible_' ~ monitor_interface | replace('-','_') }}"
deployment_extra_facts_subset: "!all,network" deployment_extra_facts_subset: "!all,network"
when: monitor_interface is defined when: monitor_interface is defined
args:
apply:
tags:
- always
tags: tags:
- always - always
@ -50,6 +58,10 @@
vars: vars:
deployment_extra_facts_filter: "ansible_memtotal*" deployment_extra_facts_filter: "ansible_memtotal*"
deployment_extra_facts_subset: "!all,hardware" deployment_extra_facts_subset: "!all,hardware"
args:
apply:
tags:
- always
tags: tags:
- always - always
@ -133,6 +145,10 @@
vars: vars:
deployment_extra_facts_filter: "ansible_memtotal*" deployment_extra_facts_filter: "ansible_memtotal*"
deployment_extra_facts_subset: "!all,hardware" deployment_extra_facts_subset: "!all,hardware"
args:
apply:
tags:
- always
tags: tags:
- always - always
@ -191,6 +207,10 @@
vars: vars:
deployment_extra_facts_filter: "ansible_memtotal*" deployment_extra_facts_filter: "ansible_memtotal*"
deployment_extra_facts_subset: "!all,hardware" deployment_extra_facts_subset: "!all,hardware"
args:
apply:
tags:
- always
tags: tags:
- always - always
roles: roles:

View File

@ -16,6 +16,10 @@
- name: Gather galera facts - name: Gather galera facts
hosts: galera_all hosts: galera_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -25,10 +29,6 @@
serial: "{{ galera_serial | default(1) }}" serial: "{{ galera_serial | default(1) }}"
user: root user: root
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
when: not is_metal when: not is_metal
vars: vars:

View File

@ -16,6 +16,10 @@
- name: Gather haproxy facts - name: Gather haproxy facts
hosts: haproxy hosts: haproxy
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -25,10 +29,6 @@
serial: "{{ haproxy_serial | default('50%') }}" serial: "{{ haproxy_serial | default('50%') }}"
user: root user: root
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
when: not is_metal when: not is_metal
- include_tasks: common-tasks/unbound-clients.yml - include_tasks: common-tasks/unbound-clients.yml

View File

@ -16,6 +16,10 @@
- name: Gather adjutant facts - name: Gather adjutant facts
hosts: adjutant_all hosts: adjutant_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -31,11 +35,6 @@
tags: tags:
- adjutant - adjutant
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
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

@ -16,6 +16,10 @@
- name: Gather aodh facts - name: Gather aodh facts
hosts: aodh_all hosts: aodh_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -31,11 +35,6 @@
tags: tags:
- aodh - aodh
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
when: not is_metal when: not is_metal

View File

@ -16,6 +16,10 @@
- name: Gather barbican facts - name: Gather barbican facts
hosts: barbican_all hosts: barbican_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -31,11 +35,6 @@
tags: tags:
- barbican - barbican
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
when: not is_metal when: not is_metal

View File

@ -16,6 +16,10 @@
- name: Gather blazar facts - name: Gather blazar facts
hosts: blazar_all hosts: blazar_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -31,11 +35,6 @@
tags: tags:
- blazar - blazar
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
when: not is_metal when: not is_metal

View File

@ -16,6 +16,10 @@
- name: Gather ceilometer facts - name: Gather ceilometer facts
hosts: ceilometer_all hosts: ceilometer_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -28,11 +32,6 @@
- "defaults/repo_packages/openstack_services.yml" - "defaults/repo_packages/openstack_services.yml"
- "defaults/{{ install_method }}_install.yml" - "defaults/{{ install_method }}_install.yml"
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
when: not is_metal when: not is_metal

View File

@ -17,6 +17,10 @@
- name: Gather cloudkitty facts - name: Gather cloudkitty facts
hosts: cloudkitty_all hosts: cloudkitty_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -32,11 +36,6 @@
tags: tags:
- cloudkitty - cloudkitty
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
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

@ -19,6 +19,10 @@
- name: Gather designate facts - name: Gather designate facts
hosts: designate_all hosts: designate_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -34,11 +38,6 @@
tags: tags:
- designate - designate
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
when: not is_metal when: not is_metal

View File

@ -16,6 +16,10 @@
- name: Gather glance facts - name: Gather glance facts
hosts: "glance_all" hosts: "glance_all"
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -31,11 +35,6 @@
tags: tags:
- glance - glance
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
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

@ -16,6 +16,10 @@
- name: Gather gnocchi facts - name: Gather gnocchi facts
hosts: gnocchi_all hosts: gnocchi_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -32,11 +36,6 @@
tags: tags:
- gnocchi - gnocchi
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
vars: vars:
list_of_bind_mounts: "{{ gnocchi_container_bind_mounts }}" list_of_bind_mounts: "{{ gnocchi_container_bind_mounts }}"

View File

@ -16,6 +16,10 @@
- name: Gather heat facts - name: Gather heat facts
hosts: heat_all hosts: heat_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -31,11 +35,6 @@
- defaults/repo_packages/openstack_services.yml - defaults/repo_packages/openstack_services.yml
- "defaults/{{ install_method }}_install.yml" - "defaults/{{ install_method }}_install.yml"
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
when: not is_metal when: not is_metal

View File

@ -16,6 +16,10 @@
- name: Gather horizon facts - name: Gather horizon facts
hosts: horizon_all hosts: horizon_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -31,11 +35,6 @@
tags: tags:
- horizon - horizon
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
when: not is_metal when: not is_metal
- include_tasks: common-tasks/unbound-clients.yml - include_tasks: common-tasks/unbound-clients.yml

View File

@ -16,6 +16,10 @@
- name: Gather ironic facts - name: Gather ironic facts
hosts: ironic_all hosts: ironic_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -31,11 +35,6 @@
tags: tags:
- ironic - ironic
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
when: not is_metal when: not is_metal

View File

@ -31,6 +31,10 @@
- name: Gather keystone facts - name: Gather keystone facts
hosts: keystone_all hosts: keystone_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -46,11 +50,6 @@
tags: tags:
- keystone - keystone
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
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

@ -19,6 +19,10 @@
- name: Gather magnum facts - name: Gather magnum facts
hosts: magnum_all hosts: magnum_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -34,11 +38,6 @@
tags: tags:
- magnum - magnum
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
when: not is_metal when: not is_metal

View File

@ -36,6 +36,10 @@
pre_tasks: pre_tasks:
- name: Gather additional facts - name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml" include_tasks: "common-tasks/gather-hardware-facts.yml"
args:
apply:
tags:
- always
tags: tags:
- always - always

View File

@ -16,6 +16,12 @@
- name: Gather masakari facts - name: Gather masakari facts
hosts: masakari_all hosts: masakari_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
vars:
deployment_extra_facts_filter: "{{ 'ansible_' ~ pacemaker_corosync_ring_interface | replace('-','_') }}"
deployment_extra_facts_subset: "!all,network"
tags: tags:
- always - always
@ -28,14 +34,6 @@
pacemaker_corosync_group: masakari_monitor pacemaker_corosync_group: masakari_monitor
pacemaker_corosync_ring_interface: "{{ masakari_monitor_corosync_multicast_interface }}" pacemaker_corosync_ring_interface: "{{ masakari_monitor_corosync_multicast_interface }}"
haveged_enabled: false haveged_enabled: false
pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
vars:
deployment_extra_facts_filter: "{{ 'ansible_' ~ pacemaker_corosync_ring_interface | replace('-','_') }}"
deployment_extra_facts_subset: "!all,network"
tags:
- always
roles: roles:
- role: "pacemaker_corosync" - role: "pacemaker_corosync"
tags: pacemaker-corosync tags: pacemaker-corosync
@ -49,11 +47,6 @@
- "defaults/repo_packages/openstack_services.yml" - "defaults/repo_packages/openstack_services.yml"
- "defaults/{{ install_method }}_install.yml" - "defaults/{{ install_method }}_install.yml"
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
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

@ -16,6 +16,10 @@
- name: Gather mistral facts - name: Gather mistral facts
hosts: mistral_all hosts: mistral_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -31,11 +35,6 @@
tags: tags:
- mistral - mistral
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
when: not is_metal when: not is_metal

View File

@ -16,6 +16,10 @@
- name: Gather murano facts - name: Gather murano facts
hosts: murano_all hosts: murano_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -31,11 +35,6 @@
tags: tags:
- murano - murano
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
when: not is_metal when: not is_metal

View File

@ -16,6 +16,10 @@
- name: Gather octavia facts - name: Gather octavia facts
hosts: octavia_all hosts: octavia_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -31,11 +35,6 @@
tags: tags:
- octavia - octavia
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
when: not is_metal when: not is_metal

View File

@ -16,6 +16,10 @@
- name: Gather placement facts - name: Gather placement facts
hosts: placement_all hosts: placement_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -31,11 +35,6 @@
tags: tags:
- placement - placement
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
when: not is_metal when: not is_metal

View File

@ -14,6 +14,10 @@
- name: Gather sahara facts - name: Gather sahara facts
hosts: sahara_all hosts: sahara_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -29,11 +33,6 @@
tags: tags:
- sahara - sahara
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
when: not is_metal when: not is_metal

View File

@ -16,6 +16,10 @@
- name: Gather senlin facts - name: Gather senlin facts
hosts: senlin_all hosts: senlin_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -31,11 +35,6 @@
tags: tags:
- senlin - senlin
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
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

@ -16,6 +16,10 @@
- name: Gather swift facts - name: Gather swift facts
hosts: swift_all:swift_remote_all hosts: swift_all:swift_remote_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -27,11 +31,6 @@
- "defaults/repo_packages/openstack_services.yml" - "defaults/repo_packages/openstack_services.yml"
- "defaults/{{ install_method }}_install.yml" - "defaults/{{ install_method }}_install.yml"
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
vars: vars:
extra_container_config_no_restart: extra_container_config_no_restart:

View File

@ -16,6 +16,10 @@
- name: Gather tacker facts - name: Gather tacker facts
hosts: tacker_all hosts: tacker_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -31,11 +35,6 @@
tags: tags:
- tacker - tacker
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
when: not is_metal when: not is_metal
roles: roles:

View File

@ -16,6 +16,10 @@
- name: Gather tempest facts - name: Gather tempest facts
hosts: utility_all[0] hosts: utility_all[0]
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -33,11 +37,6 @@
when: when:
- (not (tempest_install | default(false)) | bool) - (not (tempest_install | default(false)) | bool)
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
roles: roles:
- role: "os_tempest" - role: "os_tempest"
- role: "openstack.osa.system_crontab_coordination" - role: "openstack.osa.system_crontab_coordination"

View File

@ -19,6 +19,10 @@
- name: Gather trove facts - name: Gather trove facts
hosts: trove_all hosts: trove_all
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -34,11 +38,6 @@
tags: tags:
- trove - trove
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
tags:
- always
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
when: not is_metal when: not is_metal

View File

@ -16,6 +16,10 @@
- name: Gather zun facts - name: Gather zun facts
hosts: zun hosts: zun
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -28,11 +32,6 @@
- "defaults/repo_packages/openstack_services.yml" - "defaults/repo_packages/openstack_services.yml"
- "defaults/{{ install_method }}_install.yml" - "defaults/{{ install_method }}_install.yml"
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
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

@ -20,6 +20,13 @@
- name: Gather security hardening facts - name: Gather security hardening facts
hosts: "{{ security_host_group|default('hosts') }}" hosts: "{{ security_host_group|default('hosts') }}"
gather_facts: "{{ osa_gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
vars:
deployment_extra_facts_filter: ansible_mounts
deployment_extra_facts_subset: "!all,hardware"
when: osa_gather_facts | default(True)
tags: tags:
- always - always
@ -28,13 +35,6 @@
gather_facts: false gather_facts: false
user: root user: root
pre_tasks: pre_tasks:
- name: Gather additional facts
include_tasks: "common-tasks/gather-hardware-facts.yml"
vars:
deployment_extra_facts_filter: ansible_mounts
deployment_extra_facts_subset: "!all,hardware"
tags:
- always
roles: roles:
- role: "ansible-hardening" - role: "ansible-hardening"
when: apply_security_hardening | bool when: apply_security_hardening | bool

View File

@ -0,0 +1,4 @@
---
fixes:
- |
Fixed facts gathering when tags were provided with playbook run.