diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 17d4bcc..f2ec788 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -2,153 +2,171 @@ **Topics** -- v1\.36\.0 +- v1\.36\.1 - Release Summary + - Minor Changes +- v1\.36\.0 + - Release Summary - Major Changes - v1\.35\.0 - - Release Summary -- v1\.34\.0 - Release Summary +- v1\.34\.0 + - Release Summary - Major Changes - v1\.33\.1 - - Release Summary - - Minor Changes -- v1\.33\.0 - Release Summary + - Minor Changes +- v1\.33\.0 + - Release Summary - Major Changes - v1\.32\.0 - - Release Summary + - Release Summary - Major Changes - v1\.31\.1 - - Release Summary - - Minor Changes -- v1\.31\.0 - Release Summary + - Minor Changes +- v1\.31\.0 + - Release Summary - Major Changes - v1\.30\.3 - - Release Summary - - Minor Changes -- v1\.30\.2 - Release Summary - Minor Changes -- v1\.30\.1 +- v1\.30\.2 - Release Summary - Minor Changes -- v1\.30\.0 +- v1\.30\.1 - Release Summary - - Major Changes - Minor Changes -- v1\.29\.0 +- v1\.30\.0 - Release Summary -- v1\.28\.0 - - Release Summary - - Major Changes + - Major Changes - Minor Changes -- v1\.27\.0 +- v1\.29\.0 + - Release Summary +- v1\.28\.0 - Release Summary + - Major Changes - Minor Changes -- v1\.26\.0 +- v1\.27\.0 - Release Summary -- v1\.25\.0 + - Minor Changes +- v1\.26\.0 - Release Summary -- v1\.24\.0 +- v1\.25\.0 - Release Summary -- v1\.23\.1 +- v1\.24\.0 - Release Summary +- v1\.23\.1 + - Release Summary - Major Changes - v1\.23\.0 - - Release Summary + - Release Summary - Major Changes - v1\.22\.1 - - Release Summary - - Minor Changes -- v1\.22\.0 - Release Summary + - Minor Changes +- v1\.22\.0 + - Release Summary - v1\.21\.0 - v1\.20\.0 - - Release Summary + - Release Summary - Major Changes - v1\.19\.0 - - Release Summary + - Release Summary - Major Changes - v1\.18\.0 - v1\.17\.0 - - Release Summary + - Release Summary - Major Changes - v1\.16\.0 - v1\.15\.1 - - Release Summary - - Minor Changes -- v1\.15\.0 - Release Summary + - Minor Changes +- v1\.15\.0 + - Release Summary - Major Changes - v1\.14\.1 - - Release Summary - - Minor Changes + - Release Summary + - Minor Changes - v1\.14\.0 - v1\.13\.0 - - Release Summary + - Release Summary - Major Changes - v1\.12\.0 - - Release Summary -- v1\.11\.0 - Release Summary - - Minor Changes -- v1\.10\.0 +- v1\.11\.0 - Release Summary -- v1\.9\.1 - - Release Summary - Minor Changes -- v1\.9\.0 +- v1\.10\.0 + - Release Summary +- v1\.9\.1 - Release Summary + - Minor Changes +- v1\.9\.0 + - Release Summary - Major Changes - v1\.3\.2 - - Release Summary - - Minor Changes -- v1\.3\.1 - Release Summary - Minor Changes -- v1\.3\.0 +- v1\.3\.1 - Release Summary - Minor Changes -- v1\.2\.2 +- v1\.3\.0 - Release Summary - Minor Changes -- v1\.2\.1 +- v1\.2\.2 - Release Summary - Minor Changes -- v1\.2\.0 +- v1\.2\.1 - Release Summary + - Minor Changes +- v1\.2\.0 + - Release Summary - Major Changes - v1\.1\.2 - - Release Summary - - Minor Changes -- v1\.1\.1 - Release Summary - Minor Changes -- v1\.1\.0 +- v1\.1\.1 - Release Summary -- v1\.0\.5 - - Release Summary - Minor Changes -- v1\.0\.4 +- v1\.1\.0 + - Release Summary +- v1\.0\.5 - Release Summary - - Major Changes - Minor Changes -- v1\.0\.3 +- v1\.0\.4 - Release Summary + - Major Changes - Minor Changes -- v1\.0\.2 +- v1\.0\.3 - Release Summary + - Minor Changes +- v1\.0\.2 + - Release Summary - Major Changes - v1\.0\.0 - - Release Summary + - Release Summary - Major Changes + +## v1\.36\.1 + + +### Release Summary + +Bugfix release + + +### Minor Changes + +* fix how general\_preconfigure role handles reboot +* fix templating issues with general\_preconfigure role +* fix templating issues with hana\_preconfigure role + ## v1\.36\.0 - + ### Release Summary Feature release @@ -161,7 +179,7 @@ Feature release ## v1\.35\.0 - + ### Release Summary Feature release @@ -169,7 +187,7 @@ Feature release ## v1\.34\.0 - + ### Release Summary Feature release @@ -182,12 +200,12 @@ Feature release ## v1\.33\.1 - + ### Release Summary Documentation fix release - + ### Minor Changes * correct release changelog @@ -195,7 +213,7 @@ Documentation fix release ## v1\.33\.0 - + ### Release Summary Feature release @@ -211,7 +229,7 @@ Feature release ## v1\.32\.0 - + ### Release Summary Feature release @@ -224,12 +242,12 @@ Feature release ## v1\.31\.1 - + ### Release Summary Feature release - + ### Minor Changes * add feedback form @@ -237,7 +255,7 @@ Feature release ## v1\.31\.0 - + ### Release Summary Feature release @@ -250,12 +268,12 @@ Feature release ## v1\.30\.3 - + ### Release Summary Bugfix release - + ### Minor Changes * fix issue with swdc\_auth\_info plugin \- now can download SAP software from CDN as well \(example SAP HANA\) @@ -264,12 +282,12 @@ Bugfix release ## v1\.30\.2 - + ### Release Summary Lifecycle release - + ### Minor Changes * update collection readme file as per recommendations from Ansible Partners organization @@ -277,12 +295,12 @@ Lifecycle release ## v1\.30\.1 - + ### Release Summary Bugfix release - + ### Minor Changes * add additional checks to roles sapjvm and cloudconnector to detect if download failed @@ -292,7 +310,7 @@ Bugfix release ## v1\.30\.0 - + ### Release Summary Feature release @@ -303,7 +321,7 @@ Feature release * role \- download \- download SAP software from SWDC * role \- downloadbasket \- download SAP SWDC download basket content - + ### Minor Changes * fix issue with missing python3\-suds package on RHEL 9 @@ -311,7 +329,7 @@ Feature release ## v1\.29\.0 - + ### Release Summary Feature release @@ -319,7 +337,7 @@ Feature release ## v1\.28\.0 - + ### Release Summary Feature and bugfix release @@ -330,7 +348,7 @@ Feature and bugfix release * add role powershell \- to manage powershell installation * add role quality \- run SAP quality checks on Azure hosts - + ### Minor Changes * fix issue with host\_info module @@ -340,12 +358,12 @@ Feature and bugfix release ## v1\.27\.0 - + ### Release Summary Feature release - + ### Minor Changes * Add tags to collection metadata @@ -354,7 +372,7 @@ Feature release ## v1\.26\.0 - + ### Release Summary Feature release @@ -362,7 +380,7 @@ Feature release ## v1\.25\.0 - + ### Release Summary Feature release @@ -370,7 +388,7 @@ Feature release ## v1\.24\.0 - + ### Release Summary Feature release @@ -378,7 +396,7 @@ Feature release ## v1\.23\.1 - + ### Release Summary Documentation release @@ -391,7 +409,7 @@ Documentation release ## v1\.23\.0 - + ### Release Summary Maintenance release @@ -404,12 +422,12 @@ Maintenance release ## v1\.22\.1 - + ### Release Summary Documentation release - + ### Minor Changes * generate CHANGELOG in MD format @@ -418,7 +436,7 @@ Documentation release ## v1\.22\.0 - + ### Release Summary Feature release @@ -429,7 +447,7 @@ Feature release ## v1\.20\.0 - + ### Release Summary Feature release @@ -442,7 +460,7 @@ Feature release ## v1\.19\.0 - + ### Release Summary Feature release @@ -458,7 +476,7 @@ Feature release ## v1\.17\.0 - + ### Release Summary Feature release @@ -474,12 +492,12 @@ Feature release ## v1\.15\.1 - + ### Release Summary Bugfix release - + ### Minor Changes * Update documentation for several modules @@ -487,7 +505,7 @@ Bugfix release ## v1\.15\.0 - + ### Release Summary Feature release @@ -500,12 +518,12 @@ Feature release ## v1\.14\.1 - + ### Release Summary Bug fix release - + ### Minor Changes * Fix ansible\-lint errors @@ -517,7 +535,7 @@ Bug fix release ## v1\.13\.0 - + ### Release Summary Feature release @@ -530,7 +548,7 @@ Feature release ## v1\.12\.0 - + ### Release Summary Feature release @@ -538,12 +556,12 @@ Feature release ## v1\.11\.0 - + ### Release Summary Feature release - + ### Minor Changes * Add role pcs\_config\_checks @@ -551,7 +569,7 @@ Feature release ## v1\.10\.0 - + ### Release Summary Feature release @@ -559,12 +577,12 @@ Feature release ## v1\.9\.1 - + ### Release Summary Bug fix release - + ### Minor Changes * Fix bug with hana\_update role @@ -573,7 +591,7 @@ Bug fix release ## v1\.9\.0 - + ### Release Summary Lifecycle release @@ -591,12 +609,12 @@ Lifecycle release ## v1\.3\.2 - + ### Release Summary Bugfix release - + ### Minor Changes * Resolve sanity errors for python 2\.7 and lower versions of python 3 @@ -604,12 +622,12 @@ Bugfix release ## v1\.3\.1 - + ### Release Summary Bugfix release - + ### Minor Changes * Resolve syntax issues with hana\_update role @@ -617,12 +635,12 @@ Bugfix release ## v1\.3\.0 - + ### Release Summary Feature release - + ### Minor Changes * Add functionality to release different content to AAP and Ansible galaxy @@ -632,12 +650,12 @@ Feature release ## v1\.2\.2 - + ### Release Summary Feature release - + ### Minor Changes * Small changes to role argument\_specs \- fixes documentation linting errors @@ -645,12 +663,12 @@ Feature release ## v1\.2\.1 - + ### Release Summary Feature release - + ### Minor Changes * Collection automatically uploaded to Ansible Galaxy and AAP @@ -658,7 +676,7 @@ Feature release ## v1\.2\.0 - + ### Release Summary Feature release @@ -671,12 +689,12 @@ Feature release ## v1\.1\.2 - + ### Release Summary Bug Fix Release - + ### Minor Changes * Fix issue with role prepare @@ -684,12 +702,12 @@ Bug Fix Release ## v1\.1\.1 - + ### Release Summary Bug Fix Release - + ### Minor Changes * Fix issue with module host\_info \- module failed if SAP HANA databases installed \(incorrect indexing\) @@ -700,7 +718,7 @@ Bug Fix Release ## v1\.1\.0 - + ### Release Summary Feature Release @@ -708,12 +726,12 @@ Feature Release ## v1\.0\.5 - + ### Release Summary Bug fix release - + ### Minor Changes * Documentation added for roles hana\_update and prepare @@ -721,7 +739,7 @@ Bug fix release ## v1\.0\.4 - + ### Release Summary Two roles are added hana\_update and prepare @@ -732,7 +750,7 @@ Two roles are added hana\_update and + ### Minor Changes * GitHub action to publish collection @@ -740,12 +758,12 @@ Two roles are added hana\_update and ## v1\.0\.3 - + ### Release Summary Using changelog fragments to build collection changelog\. - + ### Minor Changes * Improvements in the collection build and publish process\. @@ -754,7 +772,7 @@ Using changelog fragments to build collection changelog\. ## v1\.0\.2 - + ### Release Summary First release of SAP Operations collection\. @@ -771,7 +789,7 @@ First release of SAP Operations collection\. ## v1\.0\.0 - + ### Release Summary First release of SAP Operations collection\. diff --git a/galaxy.yml b/galaxy.yml index 5d93c55..7e788d7 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -24,7 +24,7 @@ namespace: sap name: sap_operations -version: 1.36.0 +version: 1.36.1 readme: README.md diff --git a/roles/general_preconfigure/defaults/main.yml b/roles/general_preconfigure/defaults/main.yml index 3491362..aa6d83c 100644 --- a/roles/general_preconfigure/defaults/main.yml +++ b/roles/general_preconfigure/defaults/main.yml @@ -20,7 +20,8 @@ # If not, see . --- -general_preconfigure_tmpfs_size_gb: " +general_preconfigure_tmpfs_size_gb: "\ {{ ((0.75 * (ansible_facts['memtotal_mb'] | default(0) + ansible_facts['swaptotal_mb'] | default(0))) / 1024) | round | int }}" general_preconfigure_reboot: postpone +general_preconfigure_reboot_timeout: 3600 diff --git a/roles/general_preconfigure/handlers/main.yml b/roles/general_preconfigure/handlers/main.yml new file mode 100644 index 0000000..85111d0 --- /dev/null +++ b/roles/general_preconfigure/handlers/main.yml @@ -0,0 +1,27 @@ +# SPDX-License-Identifier: GPL-3.0-only +# SPDX-FileCopyrightText: 2024 Red Hat, Project Atmosphere +# +# Copyright 2024 Red Hat, Project Atmosphere +# +# This program is free software: you can redistribute it and/or modify it under the terms of the GNU +# General Public License as published by the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. +# +# 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. +# +# You should have received a copy of the GNU General Public License along with this program. +# If not, see . + +--- +- name: Reboot + ansible.builtin.reboot: + reboot_timeout: "{{ general_preconfigure_reboot_timeout }}" + become: true + become_user: root diff --git a/roles/general_preconfigure/meta/argument_specs.yml b/roles/general_preconfigure/meta/argument_specs.yml index 717dcfa..21ebbe7 100644 --- a/roles/general_preconfigure/meta/argument_specs.yml +++ b/roles/general_preconfigure/meta/argument_specs.yml @@ -33,9 +33,10 @@ argument_specs: none - no reboot will be be required after role applied, role will not install packages that might require reboot. Not all requirements can be fulfilled that way. List of packages to be skipped see - postpone - (default behavior) reboot might be required after packages installation by the role, - role will not reboot machine, role will not notify reboot action, in this case reboot has to be handled separately by the user. - now - role will force reboot of the host at the end of the execution - this is not idempotent and reboot will be forced each time role is executed. + postpone - (default behavior) role will not flush handlers at the end of execution, but reboot handler will be notified, + in this case this is a user obligation to flush handlers (and thus reboot the host). + now - role will flush handlers at the end of the execution - this is might not be desirable, + in situations when another role that requires reboot will run after. type: str required: false default: postpone @@ -48,6 +49,11 @@ argument_specs: type: str default: "{% raw %}{{ ((0.75 * (ansible_facts['memtotal_mb'] + ansible_facts['swaptotal_mb'])) / 1024) | round | int }}{% endraw %}" required: false + general_preconfigure_reboot_timeout: + description: Timeout for reboot handler, see how reboot is handled in general_preconfigure_reboot parameter description + type: int + required: false + default: 3600 __limitations__: options: {} diff --git a/roles/general_preconfigure/tasks/main.yml b/roles/general_preconfigure/tasks/main.yml index 7f4768e..bfdac2b 100644 --- a/roles/general_preconfigure/tasks/main.yml +++ b/roles/general_preconfigure/tasks/main.yml @@ -103,6 +103,6 @@ ansible.builtin.include_tasks: file: "rhel-{{ ansible_facts['distribution_major_version'] }}.yml" -- name: Reboot (if reboot = now) - ansible.builtin.reboot: +- name: Flush handlers (if reboot = now) + ansible.builtin.meta: flush_handlers when: general_preconfigure_reboot == 'now' diff --git a/roles/general_preconfigure/tasks/packages.yml b/roles/general_preconfigure/tasks/packages.yml index c834af4..19f882e 100644 --- a/roles/general_preconfigure/tasks/packages.yml +++ b/roles/general_preconfigure/tasks/packages.yml @@ -32,6 +32,7 @@ skip_broken: "{{ general_preconfigure_packages_skip_broken }}" become: true become_user: root + notify: Reboot - name: Install package groups ansible.builtin.dnf: @@ -41,3 +42,4 @@ skip_broken: "{{ general_preconfigure_packages_skip_broken }}" become: true become_user: root + notify: Reboot diff --git a/roles/general_preconfigure/vars/main.yml b/roles/general_preconfigure/vars/main.yml index 74b53d2..3ebde81 100644 --- a/roles/general_preconfigure/vars/main.yml +++ b/roles/general_preconfigure/vars/main.yml @@ -22,7 +22,7 @@ --- general_preconfigure_major_version: "{{ ansible_facts['distribution_major_version'] }}" general_preconfigure_architecture: "{{ ansible_facts['architecture'] }}" -general_preconfigure_kernel_parameters: " +general_preconfigure_kernel_parameters: "\ {{ general_preconfigure_kernel_parameters_mapping\ [ansible_facts['distribution_major_version']] @@ -57,21 +57,21 @@ general_preconfigure_services: state: started enabled: true -general_preconfigure_packages: " +general_preconfigure_packages: "\ {{ general_preconfigure_packages_mapping\ [general_preconfigure_major_version]\ [general_preconfigure_architecture] }}" -general_preconfigure_package_groups: " +general_preconfigure_package_groups: "\ {{ general_preconfigure_package_groups_mapping\ [general_preconfigure_major_version]\ [general_preconfigure_architecture] }}" -general_preconfigure_selinux: " +general_preconfigure_selinux: "\ {{ general_preconfigure_selinux_mapping\ [general_preconfigure_major_version] diff --git a/roles/hana_preconfigure/vars/main.yml b/roles/hana_preconfigure/vars/main.yml index 5251992..446da0c 100644 --- a/roles/hana_preconfigure/vars/main.yml +++ b/roles/hana_preconfigure/vars/main.yml @@ -21,7 +21,7 @@ --- hana_preconfigure_tuned_profile: sap-hana -hana_preconfigure_packages: " +hana_preconfigure_packages: "\ {{ hana_preconfigure_packages_mapping\ [ansible_facts['distribution_major_version']]\ @@ -46,7 +46,7 @@ hana_preconfigure_services: enabled: false state: stopped -hana_preconfigure_kernel_parameters: " +hana_preconfigure_kernel_parameters: "\ {{ hana_preconfigure_kernel_parameters_mapping\ [ansible_facts['distribution_major_version']]\