From 296e2dabe5c7816bef419787320ad7eb6270b1eb Mon Sep 17 00:00:00 2001 From: kksat <22549266+kksat@users.noreply.github.com> Date: Wed, 29 May 2024 13:27:12 +0000 Subject: [PATCH] Release galaxy-1.30.1 Signed-off-by: kksat <22549266+kksat@users.noreply.github.com> --- README.md | 20 +- docs/CHANGELOG.md | 232 ++++++++++--------- galaxy.yml | 2 +- roles/cf/tasks/absent.yml | 2 +- roles/cf/tasks/present.yml | 2 +- roles/cloudconnector/README.md | 15 +- roles/cloudconnector/defaults/main.yml | 2 + roles/cloudconnector/meta/argument_specs.yml | 6 + roles/cloudconnector/tasks/install-rpm.yml | 2 +- roles/cloudconnector/tasks/present.yml | 7 +- roles/cloudconnector/tasks/remove-rpm.yml | 2 +- roles/powershell/tasks/absent.yml | 2 +- roles/powershell/tasks/present.yml | 4 +- roles/prepare/tasks/prepare.yml | 2 +- roles/sapjvm/README.md | 13 ++ roles/sapjvm/defaults/main.yml | 2 +- roles/sapjvm/meta/argument_specs.yml | 5 + roles/sapjvm/tasks/install-rpm.yml | 2 +- roles/sapjvm/tasks/present.yml | 8 +- roles/sapjvm/tasks/remove-rpm.yml | 2 +- 20 files changed, 190 insertions(+), 142 deletions(-) diff --git a/README.md b/README.md index db6cdf9..236055d 100644 --- a/README.md +++ b/README.md @@ -25,23 +25,9 @@ If not, see . Added documentation website [docs.galaxy.saponrhel.org>](https://docs.galaxy.saponrhel.org/?utm_source=galaxy) -Added modules to manage SAP BTP resources. - -- sap.sap_operations.btp_global_account_info -- sap.sap_operations.btp_global_account_assignments_info -- sap.sap_operations.btp_subaccount -- sap.sap_operations.btp_subaccounts_info - -Added modules to manage SAP BTP Cloud Foundry. - -- sap.sap_operations.cf_marketplace_info -- sap.sap_operations.cf_service_instance -- sap.sap_operations.cf_service_instance_info -- sap.sap_operations.cf_service_instance_key -- sap.sap_operations.cf_service_instance_keys_info -- sap.sap_operations.cf_service_instances_info -- sap.sap_operations.cf_service_plans_info -- sap.sap_operations.cf_spaces_info +Added role to download SAP SWDC downloadbasket content. + +Added role to download SAP software from SWDC. # Ansible Collection - sap.sap_operations diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 3a8fbf0..9b0660a 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -2,122 +2,139 @@ **Topics** -- v1\.30\.0 +- v1\.30\.1 - Release Summary - - Major Changes - Minor Changes - - New Modules -- 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\.30\.1 + + +### Release Summary + +Bugfix release + + +### Minor Changes + +* add additional checks to roles sapjvm and cloudconnector to detect if download failed +* add eula parameters to roles sapjvm and cloudconnector +* replace ansible\.builtin\.yum with ansible\.builtin\.dnf + ## v1\.30\.0 - + ### Release Summary Feature release @@ -128,20 +145,15 @@ 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 - -### New Modules - -* sap\.sap\_operations\.swdc\_auth\_info \- Fetch http requests headers to communicate with SAP software download center \(SWDC\) - ## v1\.29\.0 - + ### Release Summary Feature release @@ -149,7 +161,7 @@ Feature release ## v1\.28\.0 - + ### Release Summary Feature and bugfix release @@ -160,7 +172,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 @@ -170,12 +182,12 @@ Feature and bugfix release ## v1\.27\.0 - + ### Release Summary Feature release - + ### Minor Changes * Add tags to collection metadata @@ -184,7 +196,7 @@ Feature release ## v1\.26\.0 - + ### Release Summary Feature release @@ -192,7 +204,7 @@ Feature release ## v1\.25\.0 - + ### Release Summary Feature release @@ -200,7 +212,7 @@ Feature release ## v1\.24\.0 - + ### Release Summary Feature release @@ -208,7 +220,7 @@ Feature release ## v1\.23\.1 - + ### Release Summary Documentation release @@ -221,7 +233,7 @@ Documentation release ## v1\.23\.0 - + ### Release Summary Maintenance release @@ -234,12 +246,12 @@ Maintenance release ## v1\.22\.1 - + ### Release Summary Documentation release - + ### Minor Changes * generate CHANGELOG in MD format @@ -248,7 +260,7 @@ Documentation release ## v1\.22\.0 - + ### Release Summary Feature release @@ -259,7 +271,7 @@ Feature release ## v1\.20\.0 - + ### Release Summary Feature release @@ -272,7 +284,7 @@ Feature release ## v1\.19\.0 - + ### Release Summary Feature release @@ -288,7 +300,7 @@ Feature release ## v1\.17\.0 - + ### Release Summary Feature release @@ -304,12 +316,12 @@ Feature release ## v1\.15\.1 - + ### Release Summary Bugfix release - + ### Minor Changes * Update documentation for several modules @@ -317,7 +329,7 @@ Bugfix release ## v1\.15\.0 - + ### Release Summary Feature release @@ -330,12 +342,12 @@ Feature release ## v1\.14\.1 - + ### Release Summary Bug fix release - + ### Minor Changes * Fix ansible\-lint errors @@ -347,7 +359,7 @@ Bug fix release ## v1\.13\.0 - + ### Release Summary Feature release @@ -360,7 +372,7 @@ Feature release ## v1\.12\.0 - + ### Release Summary Feature release @@ -368,12 +380,12 @@ Feature release ## v1\.11\.0 - + ### Release Summary Feature release - + ### Minor Changes * Add role pcs\_config\_checks @@ -381,7 +393,7 @@ Feature release ## v1\.10\.0 - + ### Release Summary Feature release @@ -389,12 +401,12 @@ Feature release ## v1\.9\.1 - + ### Release Summary Bug fix release - + ### Minor Changes * Fix bug with hana\_update role @@ -403,7 +415,7 @@ Bug fix release ## v1\.9\.0 - + ### Release Summary Lifecycle release @@ -421,12 +433,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 @@ -434,12 +446,12 @@ Bugfix release ## v1\.3\.1 - + ### Release Summary Bugfix release - + ### Minor Changes * Resolve syntax issues with hana\_update role @@ -447,12 +459,12 @@ Bugfix release ## v1\.3\.0 - + ### Release Summary Feature release - + ### Minor Changes * Add functionality to release different content to AAP and Ansible galaxy @@ -462,12 +474,12 @@ Feature release ## v1\.2\.2 - + ### Release Summary Feature release - + ### Minor Changes * Small changes to role argument\_specs \- fixes documentation linting errors @@ -475,12 +487,12 @@ Feature release ## v1\.2\.1 - + ### Release Summary Feature release - + ### Minor Changes * Collection automatically uploaded to Ansible Galaxy and AAP @@ -488,7 +500,7 @@ Feature release ## v1\.2\.0 - + ### Release Summary Feature release @@ -501,12 +513,12 @@ Feature release ## v1\.1\.2 - + ### Release Summary Bug Fix Release - + ### Minor Changes * Fix issue with role prepare @@ -514,12 +526,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\) @@ -530,7 +542,7 @@ Bug Fix Release ## v1\.1\.0 - + ### Release Summary Feature Release @@ -538,12 +550,12 @@ Feature Release ## v1\.0\.5 - + ### Release Summary Bug fix release - + ### Minor Changes * Documentation added for roles hana\_update and prepare @@ -551,7 +563,7 @@ Bug fix release ## v1\.0\.4 - + ### Release Summary Two roles are added hana\_update and prepare @@ -562,7 +574,7 @@ Two roles are added hana\_update and + ### Minor Changes * GitHub action to publish collection @@ -570,12 +582,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\. @@ -584,7 +596,7 @@ Using changelog fragments to build collection changelog\. ## v1\.0\.2 - + ### Release Summary First release of SAP Operations collection\. @@ -601,7 +613,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 53dbb28..64430c1 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -24,7 +24,7 @@ namespace: sap name: sap_operations -version: 1.30.0 +version: 1.30.1 readme: README.md diff --git a/roles/cf/tasks/absent.yml b/roles/cf/tasks/absent.yml index 6001eb1..26a0007 100644 --- a/roles/cf/tasks/absent.yml +++ b/roles/cf/tasks/absent.yml @@ -21,7 +21,7 @@ --- - name: Make sure Cloud Foundry cli absent - ansible.builtin.yum: + ansible.builtin.dnf: name: "{{ cf_package_name }}" state: absent become: true diff --git a/roles/cf/tasks/present.yml b/roles/cf/tasks/present.yml index 7b8f6b2..a52476a 100644 --- a/roles/cf/tasks/present.yml +++ b/roles/cf/tasks/present.yml @@ -31,7 +31,7 @@ become_user: root - name: Make sure Cloud Foundry cli installed - ansible.builtin.yum: + ansible.builtin.dnf: name: "{{ cf_package_name }}" state: present become: true diff --git a/roles/cloudconnector/README.md b/roles/cloudconnector/README.md index b8edc1d..73a4179 100644 --- a/roles/cloudconnector/README.md +++ b/roles/cloudconnector/README.md @@ -83,7 +83,7 @@ _Type:_ `str` _Required:_ `False` _Description:_ Filename of downloaded SAP cloud connector binaries, -By default Filename is sapcc-{{ cloudconnector_version }}-{{ cloudconnector_system }}-{{ cloudconnector_architecture }}.{{ cloudconnector_archive_extension }} +By default Filename is sapcc-{{ cloudconnector_version }}-{{ cloudconnector_system }}-{{ cloudconnector_architecture }}.{{ cloudconnector_archive_extension }} See definition of variables in defaults/main.yml and vars/main.yml @@ -206,6 +206,19 @@ _Description:_ Bool to define if cloud connector should be installed in portable mode + +#### cloudconnector_eula + + +_Type:_ `str` + +_Default:_ `eula_3_2_agreed=tools.hana.ondemand.com/developer-license-3_2.txt` + +_Required:_ `False` +_Description:_ +Confirms that you are agree to SAP developer license + + ## Limitations diff --git a/roles/cloudconnector/defaults/main.yml b/roles/cloudconnector/defaults/main.yml index 36e4547..7552342 100644 --- a/roles/cloudconnector/defaults/main.yml +++ b/roles/cloudconnector/defaults/main.yml @@ -41,3 +41,5 @@ cloudconnector_system: "{{ (ansible_system | default('linux')) | lower }}" cloudconnector_architecture: "{{ cloudconnector_architecture_mapping[ansible_architecture | default('x86_64')] }}" cloudconnector_portable: false + +cloudconnector_eula: eula_3_2_agreed=tools.hana.ondemand.com/developer-license-3_2.txt diff --git a/roles/cloudconnector/meta/argument_specs.yml b/roles/cloudconnector/meta/argument_specs.yml index 5666e45..b64f04c 100644 --- a/roles/cloudconnector/meta/argument_specs.yml +++ b/roles/cloudconnector/meta/argument_specs.yml @@ -125,6 +125,12 @@ argument_specs: required: false default: false + cloudconnector_eula: + description: Confirms that you are agree to SAP developer license + type: str + required: false + default: eula_3_2_agreed=tools.hana.ondemand.com/developer-license-3_2.txt + __limitations__: options: {} short_description: Limitations diff --git a/roles/cloudconnector/tasks/install-rpm.yml b/roles/cloudconnector/tasks/install-rpm.yml index c620804..73777b0 100644 --- a/roles/cloudconnector/tasks/install-rpm.yml +++ b/roles/cloudconnector/tasks/install-rpm.yml @@ -39,7 +39,7 @@ failed_when: __cloudconnector_unpack.files | length > 1 - name: Install SAP Cloud Connector RPM - ansible.builtin.yum: + ansible.builtin.dnf: name: "{{ cloudconnector_unpack_destination }}/{{ __cloudconnector_unpack.files | first }}" state: present disable_gpg_check: true diff --git a/roles/cloudconnector/tasks/present.yml b/roles/cloudconnector/tasks/present.yml index 534a61e..57ff328 100644 --- a/roles/cloudconnector/tasks/present.yml +++ b/roles/cloudconnector/tasks/present.yml @@ -35,8 +35,13 @@ dest: "{{ cloudconnector_download_filepath }}" timeout: "{{ cloudconnector_download_timeout_seconds }}" headers: - Cookie: eula_3_1_agreed=tools.hana.ondemand.com/developer-license-3_1.txt + Cookie: "{{ cloudconnector_eula }}" register: uri + failed_when: + - >- + uri.url is defined + and + (uri.url | lower) is contains('eula') - name: Install SAP Cloud Connector ansible.builtin.include_tasks: diff --git a/roles/cloudconnector/tasks/remove-rpm.yml b/roles/cloudconnector/tasks/remove-rpm.yml index 59f5278..a07a355 100644 --- a/roles/cloudconnector/tasks/remove-rpm.yml +++ b/roles/cloudconnector/tasks/remove-rpm.yml @@ -21,6 +21,6 @@ # If not, see . - name: Remove cloud connector package - ansible.builtin.yum: + ansible.builtin.dnf: name: "{{ cloudconnector_package_name }}" state: absent diff --git a/roles/powershell/tasks/absent.yml b/roles/powershell/tasks/absent.yml index 7b7dfbc..e472ff2 100644 --- a/roles/powershell/tasks/absent.yml +++ b/roles/powershell/tasks/absent.yml @@ -21,7 +21,7 @@ --- - name: Remove Powershell - ansible.builtin.yum: + ansible.builtin.dnf: name: powershell state: absent become: true diff --git a/roles/powershell/tasks/present.yml b/roles/powershell/tasks/present.yml index a2ce3b5..87c3c63 100644 --- a/roles/powershell/tasks/present.yml +++ b/roles/powershell/tasks/present.yml @@ -28,14 +28,14 @@ become_user: root - name: Install Microsoft packages repository - ansible.builtin.yum: + ansible.builtin.dnf: name: "https://packages.microsoft.com/config/rhel/{{ ansible_distribution_major_version }}/packages-microsoft-prod.rpm" state: present become: true become_user: root - name: Install Powershell - ansible.builtin.yum: + ansible.builtin.dnf: name: powershell state: present become: true diff --git a/roles/prepare/tasks/prepare.yml b/roles/prepare/tasks/prepare.yml index b5f390d..f908890 100644 --- a/roles/prepare/tasks/prepare.yml +++ b/roles/prepare/tasks/prepare.yml @@ -28,7 +28,7 @@ changed_when: false - name: Ensure required packages are installed - ansible.builtin.yum: + ansible.builtin.dnf: name: "{{ __prepare_packages }}" become: true become_user: root diff --git a/roles/sapjvm/README.md b/roles/sapjvm/README.md index 305a23b..f97e2c9 100644 --- a/roles/sapjvm/README.md +++ b/roles/sapjvm/README.md @@ -214,6 +214,19 @@ _Description:_ If portable version of SAP JVM has to be downloaded and installed / removed + +#### sapjvm_eula + + +_Type:_ `str` + +_Default:_ `eula_3_2_agreed=tools.hana.ondemand.com/developer-license-3_2.txt` + +_Required:_ `False` +_Description:_ +Confirms that you are agree to SAP developer license + + ## Limitations diff --git a/roles/sapjvm/defaults/main.yml b/roles/sapjvm/defaults/main.yml index 161d914..c992562 100644 --- a/roles/sapjvm/defaults/main.yml +++ b/roles/sapjvm/defaults/main.yml @@ -42,4 +42,4 @@ sapjvm_system: "{{ (ansible_system | default('linux')) | lower }}" sapjvm_architecture: "{{ sapjvm_architecture_mapping[ansible_architecture | default('x86_64')] }}" -sapjvm_portable: false +sapjvm_eula: eula_3_2_agreed=tools.hana.ondemand.com/developer-license-3_2.txt diff --git a/roles/sapjvm/meta/argument_specs.yml b/roles/sapjvm/meta/argument_specs.yml index a0d04de..250b561 100644 --- a/roles/sapjvm/meta/argument_specs.yml +++ b/roles/sapjvm/meta/argument_specs.yml @@ -112,6 +112,11 @@ argument_specs: type: bool required: false default: false + sapjvm_eula: + description: Confirms that you are agree to SAP developer license + type: str + required: false + default: eula_3_2_agreed=tools.hana.ondemand.com/developer-license-3_2.txt __limitations__: options: {} diff --git a/roles/sapjvm/tasks/install-rpm.yml b/roles/sapjvm/tasks/install-rpm.yml index 7f6f4d2..f0260c1 100644 --- a/roles/sapjvm/tasks/install-rpm.yml +++ b/roles/sapjvm/tasks/install-rpm.yml @@ -21,7 +21,7 @@ --- - name: Install SAP JVM RPM - ansible.builtin.yum: + ansible.builtin.dnf: name: "{{ sapjvm_download_filepath }}" state: present disable_gpg_check: true diff --git a/roles/sapjvm/tasks/present.yml b/roles/sapjvm/tasks/present.yml index 0e60044..ec012df 100644 --- a/roles/sapjvm/tasks/present.yml +++ b/roles/sapjvm/tasks/present.yml @@ -35,7 +35,13 @@ dest: "{{ sapjvm_download_filepath }}" timeout: "{{ sapjvm_download_timeout_seconds }}" headers: - Cookie: eula_3_1_agreed=tools.hana.ondemand.com/developer-license-3_1.txt + Cookie: "{{ sapjvm_eula }}" + register: uri + failed_when: + - >- + uri.url is defined + and + (uri.url | lower) is contains('eula') - name: Install SAP JVM ansible.builtin.include_tasks: diff --git a/roles/sapjvm/tasks/remove-rpm.yml b/roles/sapjvm/tasks/remove-rpm.yml index 1188296..9685d47 100644 --- a/roles/sapjvm/tasks/remove-rpm.yml +++ b/roles/sapjvm/tasks/remove-rpm.yml @@ -21,6 +21,6 @@ --- - name: Remove SAP JVM package - ansible.builtin.yum: + ansible.builtin.dnf: name: "{{ sapjvm_package_name }}" state: absent