Merge "Gather additional required facts to min"

inventory/group_vars/all/all.yml

@@ -145,3 +145,6 @@ _global_pins_file_path: "{{ openstack_clone_root }}/global-requirement-pins.txt"
 
 venv_build_global_constraints: >-
   {{ lookup('file', _global_pins_file_path).splitlines() | reject('match','^#.*$') | reject('equalto', '') | list }}
+
+deployment_extra_facts_subset: hardware
+deployment_extra_facts_filter: ansible_processor_*

playbooks/ceph-install.yml

@@ -27,6 +27,32 @@
     - "defaults/{{ install_method }}_install.yml"
   pre_tasks:
 
+    - name: Gather additional facts for monitor_address_block
+      include_tasks: "common-tasks/gather-hardware-facts.yml"
+      vars:
+        deployment_extra_facts_filter: "ansible_all_ipv[4,6]_addresses"
+        deployment_extra_facts_subset: "!all,network"
+      when: monitor_address_block is defined
+      tags:
+        - always
+
+    - name: Gather additional facts for monitor_interface
+      include_tasks: "common-tasks/gather-hardware-facts.yml"
+      vars:
+        deployment_extra_facts_filter: "{{ 'ansible_' ~ monitor_interface | replace('-','_') }}"
+        deployment_extra_facts_subset: "!all,network"
+      when: monitor_interface is defined
+      tags:
+        - always
+
+    - name: Gather memory facts
+      include_tasks: "common-tasks/gather-hardware-facts.yml"
+      vars:
+        deployment_extra_facts_filter: "ansible_memtotal*"
+        deployment_extra_facts_subset: "!all,hardware"
+      tags:
+        - always
+
     - import_tasks: common-tasks/ceph-server.yml
 
     - name: Create systemd service directory
@@ -102,6 +128,14 @@
     - "defaults/{{ install_method }}_install.yml"
   pre_tasks:
 
+    - name: Gather memory facts
+      include_tasks: "common-tasks/gather-hardware-facts.yml"
+      vars:
+        deployment_extra_facts_filter: "ansible_memtotal*"
+        deployment_extra_facts_subset: "!all,hardware"
+      tags:
+        - always
+
     - import_tasks: common-tasks/ceph-server.yml
 
   roles:
@@ -151,6 +185,14 @@
   user: root
   vars_files:
     - "defaults/{{ install_method }}_install.yml"
+  pre_tasks:
+    - name: Gather memory facts
+      include_tasks: "common-tasks/gather-hardware-facts.yml"
+      vars:
+        deployment_extra_facts_filter: "ansible_memtotal*"
+        deployment_extra_facts_subset: "!all,hardware"
+      tags:
+        - always
   roles:
     - role: ceph-defaults
       tags:

playbooks/common-tasks/gather-hardware-facts.yml

@@ -0,0 +1,19 @@
+---
+# Copyright 2021, City Network International AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- name: Gather additional facts
+  setup:
+    gather_subset: "{{ deployment_extra_facts_subset }}"
+    filter: "{{ deployment_extra_facts_filter }}"

playbooks/os-adjutant-install.yml

@@ -31,6 +31,11 @@
   tags:
     - adjutant
   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
     # config file changes which causes a container/service
     # restart do not cause an unexpected outage, we drain

playbooks/os-aodh-install.yml

@@ -30,6 +30,11 @@
   tags:
     - aodh
   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"
       when: not is_metal
 

playbooks/os-barbican-install.yml

@@ -30,6 +30,11 @@
   tags:
     - barbican
   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"
       when: not is_metal
 

playbooks/os-blazar-install.yml

@@ -30,6 +30,11 @@
   tags:
     - blazar
   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"
       when: not is_metal
 

playbooks/os-ceilometer-install.yml

@@ -27,6 +27,11 @@
     - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   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"
       when: not is_metal
 

playbooks/os-cloudkitty-install.yml

@@ -32,6 +32,11 @@
   tags:
     - cloudkitty
   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
     # config file changes which causes a container/service
     # restart do not cause an unexpected outage, we drain

playbooks/os-designate-install.yml

@@ -33,6 +33,11 @@
   tags:
     - designate
   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"
       when: not is_metal
 

playbooks/os-glance-install.yml

@@ -31,6 +31,11 @@
   tags:
     - glance
   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
     # config file changes which causes a container/service
     # restart do not cause an unexpected outage, we drain

playbooks/os-gnocchi-install.yml

@@ -31,6 +31,11 @@
   tags:
     - gnocchi
   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"
       vars:
         list_of_bind_mounts: "{{ gnocchi_container_bind_mounts }}"

playbooks/os-heat-install.yml

@@ -30,6 +30,11 @@
     - defaults/repo_packages/openstack_services.yml
     - "defaults/{{ install_method }}_install.yml"
   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"
       when: not is_metal
 

playbooks/os-horizon-install.yml

@@ -30,6 +30,11 @@
   tags:
     - horizon
   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"
       when: not is_metal
     - include_tasks: common-tasks/unbound-clients.yml

playbooks/os-ironic-install.yml

@@ -30,6 +30,11 @@
   tags:
     - ironic
   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"
       when: not is_metal
 

playbooks/os-keystone-install.yml

@@ -46,6 +46,10 @@
   tags:
     - keystone
   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
     # config file changes which causes a container/service

playbooks/os-magnum-install.yml

@@ -33,6 +33,11 @@
   tags:
     - magnum
   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"
       when: not is_metal
 

playbooks/os-manila-install.yml

@@ -33,6 +33,11 @@
   tags:
     - manila
   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
     # config file changes which causes a container/service
     # restart do not cause an unexpected outage, we drain

playbooks/os-masakari-install.yml

@@ -27,6 +27,14 @@
     pacemaker_corosync_group: masakari_monitor
     pacemaker_corosync_ring_interface: "{{ masakari_monitor_corosync_multicast_interface }}"
     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:
     - role: "pacemaker_corosync"
       tags: pacemaker-corosync
@@ -39,6 +47,11 @@
     - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   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
     # config file changes which causes a container/service
     # restart do not cause an unexpected outage, we drain

playbooks/os-mistral-install.yml

@@ -30,6 +30,11 @@
   tags:
     - mistral
   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"
       when: not is_metal
 

playbooks/os-murano-install.yml

@@ -29,6 +29,11 @@
   tags:
     - murano
   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"
       when: not is_metal
 

playbooks/os-octavia-install.yml

@@ -30,6 +30,11 @@
   tags:
     - octavia
   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"
       when: not is_metal
 

playbooks/os-panko-install.yml

@@ -29,6 +29,11 @@
   tags:
     - panko
   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"
       when: not is_metal
   roles:

playbooks/os-placement-install.yml

@@ -30,6 +30,11 @@
   tags:
     - placement
   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"
       when: not is_metal
 

playbooks/os-sahara-install.yml

@@ -28,6 +28,11 @@
   tags:
     - sahara
   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"
       when: not is_metal
 

playbooks/os-senlin-install.yml

@@ -30,6 +30,11 @@
   tags:
     - senlin
   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
     # config file changes which causes a container/service
     # restart do not cause an unexpected outage, we drain

playbooks/os-swift-install.yml

@@ -27,6 +27,11 @@
     - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   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"
       vars:
         extra_container_config_no_restart:

playbooks/os-tacker-install.yml

@@ -30,6 +30,11 @@
   tags:
     - tacker
   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"
       when: not is_metal
   roles:

playbooks/os-tempest-install.yml

@@ -33,6 +33,11 @@
       when:
         - (not (tempest_install | default(false)) | bool)
 
+    - name: Gather additional facts
+      include_tasks: "common-tasks/gather-hardware-facts.yml"
+      tags:
+        - always
+
   roles:
     - role: "os_tempest"
     - role: "system_crontab_coordination"

playbooks/os-trove-install.yml

@@ -33,6 +33,11 @@
   tags:
     - trove
   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"
       when: not is_metal
 

playbooks/os-zun-install.yml

@@ -27,6 +27,11 @@
     - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   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
     # config file changes which causes a container/service
     # restart do not cause an unexpected outage, we drain

playbooks/security-hardening.yml

@@ -27,6 +27,14 @@
   hosts: "{{ security_host_group|default('hosts') }}"
   gather_facts: false
   user: root
+  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:
     - role: "ansible-hardening"
       when: apply_security_hardening | bool