From 4ab067d52311098de67cad42d165c6d6cc72fbd7 Mon Sep 17 00:00:00 2001 From: martinfanning1 <41327835+martinfanning1@users.noreply.github.com> Date: Mon, 8 Apr 2024 17:21:05 +0100 Subject: [PATCH] IBM Fixpack Role Updates (#73) Co-authored-by: Martin Fanning --- galaxy.yml | 2 +- molecule/__ihs-v90/converge.yml | 2 +- molecule/__websphere-v90/converge.yml | 4 +-- molecule/db21159/converge.yml | 14 ++++++++++ molecule/db21159/molecule.yml | 34 +++++++++++++++++++++++ molecule/db21159/verify.yml | 22 +++++++++++++++ molecule/iim-191-rockylinux8/converge.yml | 2 +- roles/db2/README.md | 4 +-- roles/db2/defaults/main.yml | 2 +- roles/db2/vars/v11.5.9.0.yml | 4 +++ roles/ihs/README.md | 10 +++---- roles/ihs/defaults/main.yml | 2 +- roles/ihs/vars/v9.0.5.19.yml | 16 +++++++++++ roles/iim/README.md | 2 +- roles/iim/defaults/main.yml | 2 +- roles/websphere/README.md | 4 +-- roles/websphere/defaults/main.yml | 2 +- roles/websphere/vars/v9.0.5.19.yml | 17 ++++++++++++ 18 files changed, 126 insertions(+), 19 deletions(-) create mode 100644 molecule/db21159/converge.yml create mode 100644 molecule/db21159/molecule.yml create mode 100644 molecule/db21159/verify.yml create mode 100644 roles/db2/vars/v11.5.9.0.yml create mode 100644 roles/ihs/vars/v9.0.5.19.yml create mode 100644 roles/websphere/vars/v9.0.5.19.yml diff --git a/galaxy.yml b/galaxy.yml index 1e3acae2..d289ee21 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -11,7 +11,7 @@ name: spm_middleware # The version of the collection. Must be compatible with semantic versioning # Please note. version also exists in /github/workflows/release.yml and will need to be update also -version: 1.5.1 +version: 1.5.2 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md diff --git a/molecule/__ihs-v90/converge.yml b/molecule/__ihs-v90/converge.yml index d87a7ceb..99cac1df 100644 --- a/molecule/__ihs-v90/converge.yml +++ b/molecule/__ihs-v90/converge.yml @@ -6,7 +6,7 @@ - merative.spm_middleware vars: - ihs_version: 9.0.5.18 + ihs_version: 9.0.5.19 download_url: "{{ lookup('env', 'ARTIFACTORY_URL') }}/{{ lookup('env', 'ARTIFACTORY_REPO') }}/SoftwareInstallers" download_header: { 'X-JFrog-Art-Api': "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}"} diff --git a/molecule/__websphere-v90/converge.yml b/molecule/__websphere-v90/converge.yml index c192d9ed..91192c6f 100644 --- a/molecule/__websphere-v90/converge.yml +++ b/molecule/__websphere-v90/converge.yml @@ -6,9 +6,9 @@ - merative.spm_middleware vars: - iim_agent_version: 1.9.2006.20230925_1323 + iim_agent_version: 1.9.2008.20240227_0018 iim_install_path: /opt/IBM/InstallationManager - websphere_version: 9.0.5.18 + websphere_version: 9.0.5.19 download_url: "{{ lookup('env', 'ARTIFACTORY_URL') }}/{{ lookup('env', 'ARTIFACTORY_REPO') }}/SoftwareInstallers" download_header: { 'X-JFrog-Art-Api': "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}"} diff --git a/molecule/db21159/converge.yml b/molecule/db21159/converge.yml new file mode 100644 index 00000000..1ee1c30d --- /dev/null +++ b/molecule/db21159/converge.yml @@ -0,0 +1,14 @@ +--- +- name: Converge + hosts: all + + collections: + - merative.spm_middleware + + roles: + - db2 + + vars: + db2_version: "11.5.9.0" + download_url: "{{ lookup('env', 'ARTIFACTORY_URL') }}/{{ lookup('env', 'ARTIFACTORY_REPO') }}/SoftwareInstallers" + download_header: { 'X-JFrog-Art-Api': "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}"} diff --git a/molecule/db21159/molecule.yml b/molecule/db21159/molecule.yml new file mode 100644 index 00000000..5d0d3713 --- /dev/null +++ b/molecule/db21159/molecule.yml @@ -0,0 +1,34 @@ +--- +driver: + name: docker + provider: + name: docker + +lint: | + set -e + yamllint . + +platforms: + - name: rockylinux8 + image: rockylinux:8 + dockerfile: ../_resources/Dockerfile.j2 + pre_build_image: false + privileged: true + volume_mounts: + - "/sys/fs/cgroup:/sys/fs/cgroup:rw" + command: "/usr/sbin/init" + environment: + container: docker + +provisioner: + name: ansible + log: true + config_options: + defaults: + stderr_callback: debug + stdout_callback: debug + env: + ANSIBLE_FORCE_COLOR: 'true' + playbooks: + converge: ./converge.yml + verify: ./verify.yml diff --git a/molecule/db21159/verify.yml b/molecule/db21159/verify.yml new file mode 100644 index 00000000..777fd9e3 --- /dev/null +++ b/molecule/db21159/verify.yml @@ -0,0 +1,22 @@ +--- +- name: Verify + hosts: all + pre_tasks: + - stat: "path=/opt/Props/Bootstrap.properties" + register: boot_props + - command: "db2level" + become: true + become_user: "db2admin" + become_method: sudo + become_flags: "-i" + register: db2level_cmd + + tasks: + - name: Check that Bootstrap.properties exists + assert: + that: boot_props.stat.exists + - name: Check that the db2level command is working + assert: + that: + - db2level_cmd.rc == 0 + - "'v11.5.9' in db2level_cmd.stdout" diff --git a/molecule/iim-191-rockylinux8/converge.yml b/molecule/iim-191-rockylinux8/converge.yml index 6c3cefd2..e0566aee 100644 --- a/molecule/iim-191-rockylinux8/converge.yml +++ b/molecule/iim-191-rockylinux8/converge.yml @@ -9,6 +9,6 @@ - iim vars: - iim_agent_version: 1.9.2006.20230925_1323 + iim_agent_version: 1.9.2008.20240227_0018 download_url: "{{ lookup('env','ARTIFACTORY_URL') }}/{{ lookup('env','ARTIFACTORY_REPO') }}/SoftwareInstallers" download_header: {'X-JFrog-Art-Api': "{{ lookup('env','ARTIFACTORY_TOKEN' )}}"} diff --git a/roles/db2/README.md b/roles/db2/README.md index bba17d54..60029a0d 100644 --- a/roles/db2/README.md +++ b/roles/db2/README.md @@ -13,7 +13,7 @@ Ensure you update / override password variables prior to using the role. | Property Name | Default value | | ------------------------- | --------------------------------------------------- | | `db2_install_path` | `/opt/IBM/db2` | -| `db2_version` | `11.1.4.6` | +| `db2_version` | `11.5.9.0` | | `db2_product` | `DB2_SERVER_EDITION` | | `db2_bypass_prereq_check` | `False` | | ------------------------- | --------------------------------------------------- | @@ -43,7 +43,7 @@ None - hosts: servers roles: - role: merative.spm_middleware.db2 - db2_version: 11.5.5.0 + db2_version: 11.5.9.0 ``` ## License diff --git a/roles/db2/defaults/main.yml b/roles/db2/defaults/main.yml index 12b9b50c..ab6c7ed0 100644 --- a/roles/db2/defaults/main.yml +++ b/roles/db2/defaults/main.yml @@ -3,7 +3,7 @@ instance_id: inst1 instance_port: 50000 db2_install_path: /opt/IBM/db2 -db2_version: 11.5.8.0 +db2_version: 11.5.9.0 db2_product: DB2_SERVER_EDITION db2_bypass_prereq_check: false db2_activate: True diff --git a/roles/db2/vars/v11.5.9.0.yml b/roles/db2/vars/v11.5.9.0.yml new file mode 100644 index 00000000..efb6b74b --- /dev/null +++ b/roles/db2/vars/v11.5.9.0.yml @@ -0,0 +1,4 @@ +--- +# paths can be relative to download_url or local +db2_installer_path: DB2/11.5/v11.5.9_linuxx64_universal_fixpack.tar.gz +db2_license_path: DB2/11.5/db2ese_u.lic diff --git a/roles/ihs/README.md b/roles/ihs/README.md index 7ba4cfa8..e672af24 100644 --- a/roles/ihs/README.md +++ b/roles/ihs/README.md @@ -13,17 +13,17 @@ NOTE: ihs_admin_pass should be changed after first installation. | `ihs_install_path` | `/opt/IBM/HTTPServer` | | `plg_install_path` | `/opt/IBM/WebSphere/Plugins` | | `wct_install_path` | `/opt/IBM/WebSphere/Toolbox` | -| `ihs_version` | `9.0.5.18` | +| `ihs_version` | `9.0.5.19` | | `ihs_config_type` | `local_distributed` | | `ihs_admin_user` | `wasadmin` | | `ihs_admin_pass` | `wasadmin` | | ----------------------- | --------------------------------------------------- | -| Version-specific: | Values from `9.0.5.18` | +| Version-specific: | Values from `9.0.5.19` | | ----------------------- | --------------------------------------------------- | | `ihs_installer_archive_list` | `was.repo.90500.[ihs|plugins|wct].zip` | | `ihs_fp_installer_path` | `WAS/9.0.5Fixpacks` | -| `ihs_fp_installer_archive_list` | `9.0.5-WS-[IHSPLG|WCT]-FP018.zip` | -| `ihs_pid` | `v90_9.0.5018.20231113_1345` | +| `ihs_fp_installer_archive_list` | `9.0.5-WS-[IHSPLG|WCT]-FP019.zip` | +| `ihs_pid` | `v90_9.0.5019.20240304_1205` | | `ihs_java_zip_path` | `Java/IBM/ibm-java-sdk-8.0-8.15-linux-x64-installmgr.zip` | | `ihs_java_pid` | `com.ibm.java.jdk.v8` | | ----------------------- | --------------------------------------------------- | @@ -53,7 +53,7 @@ merative.spm_middleware.iim - merative.spm_middleware.iim - merative.spm_middleware.ihs vars: - - ihs_version: 9.0.5.18 + - ihs_version: 9.0.5.19 - download_url: "https://myserver.com/IHS/repos" - download_header: { 'Authorization': 'Basic EncodedString'} ``` diff --git a/roles/ihs/defaults/main.yml b/roles/ihs/defaults/main.yml index b6efb8d8..e3177bc7 100644 --- a/roles/ihs/defaults/main.yml +++ b/roles/ihs/defaults/main.yml @@ -5,7 +5,7 @@ ihs_install_path: /opt/IBM/HTTPServer plg_install_path: /opt/IBM/WebSphere/Plugins wct_install_path: /opt/IBM/WebSphere/Toolbox -ihs_version: 9.0.5.18 +ihs_version: 9.0.5.19 ihs_config_type: local_distributed ihs_admin_user: wasadmin diff --git a/roles/ihs/vars/v9.0.5.19.yml b/roles/ihs/vars/v9.0.5.19.yml new file mode 100644 index 00000000..106c545a --- /dev/null +++ b/roles/ihs/vars/v9.0.5.19.yml @@ -0,0 +1,16 @@ +--- +ihs_installer_path: WAS/9.0.5ND +ihs_installer_archive_list: + - was.repo.90500.ihs.zip + - was.repo.90500.plugins.zip + - was.repo.90500.wct.zip + +ihs_fp_installer_path: WAS/9.0.5Fixpacks +ihs_fp_installer_archive_list: + - 9.0.5-WS-IHSPLG-FP019.zip + - 9.0.5-WS-WCT-FP019.zip + +ihs_pid: v90_9.0.5019.20240304_1205 + +ihs_java_zip_path: Java/IBM/ibm-java-sdk-8.0-8.15-linux-x64-installmgr.zip +ihs_java_pid: com.ibm.java.jdk.v8 diff --git a/roles/iim/README.md b/roles/iim/README.md index e1ac4fae..a7c69aab 100644 --- a/roles/iim/README.md +++ b/roles/iim/README.md @@ -10,7 +10,7 @@ None | Property Name | Default value | | ------------------- | ----------------------------------------------------- | -| `iim_agent_version` | `1.9.2006.20230925_1323` | +| `iim_agent_version` | `1.9.2008.20240227_0018` | | `iim_install_path` | `/opt/IBM/InstallationManager` | | `download_url` | # Set this if license and installer is being downloaded from a http server| | `download_header` | # Use this in conjunction with `download_url` | diff --git a/roles/iim/defaults/main.yml b/roles/iim/defaults/main.yml index 00c1a313..ba48eaee 100644 --- a/roles/iim/defaults/main.yml +++ b/roles/iim/defaults/main.yml @@ -1,5 +1,5 @@ --- -iim_agent_version: 1.9.2006.20230925_1323 +iim_agent_version: 1.9.2008.20240227_0018 # Server info for downloading installers / repos directly, leave blank to copy download_url: # e.g. https://artifactory/repo diff --git a/roles/websphere/README.md b/roles/websphere/README.md index d06d431b..abf8ca0b 100644 --- a/roles/websphere/README.md +++ b/roles/websphere/README.md @@ -11,7 +11,7 @@ IBM Installation Manager (1.9.x) must already be installed in the target environ | Property Name | Default value | | ------------------------ | --------------------------------------------------- | | `websphere_install_path` | `/opt/IBM/WebSphere/AppServer` | -| `websphere_version` | `9.0.5.8` | +| `websphere_version` | `9.0.5.19` | | ------------------------ | --------------------------------------------------- | | `iim_install_path` | `/opt/IBM/InstallationManager` | | `profiled_path` | `/opt/profile.d` | @@ -35,7 +35,7 @@ merative.spm_middleware.iim - merative.spm_middleware vars: - websphere_version: 9.0.5.8 + websphere_version: 9.0.5.19 download_url: "https://myserver.com/was/repos" download_header: { 'Authorization': 'Basic EncodedString'} diff --git a/roles/websphere/defaults/main.yml b/roles/websphere/defaults/main.yml index 29c96cbc..29de8458 100644 --- a/roles/websphere/defaults/main.yml +++ b/roles/websphere/defaults/main.yml @@ -3,7 +3,7 @@ iim_install_path: /opt/IBM/InstallationManager # websphere websphere_install_path: /opt/IBM/WebSphere/AppServer -websphere_version: 9.0.5.18 +websphere_version: 9.0.5.19 security_username: websphere # use encrypted password security_password: dummypassword diff --git a/roles/websphere/vars/v9.0.5.19.yml b/roles/websphere/vars/v9.0.5.19.yml new file mode 100644 index 00000000..fe355f56 --- /dev/null +++ b/roles/websphere/vars/v9.0.5.19.yml @@ -0,0 +1,17 @@ +--- +# FP Vars +websphere_pid: v90_9.0.5019.20240304_1205 +websphere_fp_path: WAS/9.0.5Fixpacks +websphere_fp_archive_list: + - 9.0.5-WS-WAS-FP019.zip + +# Base Vars +websphere_base_pid: com.ibm.websphere.ND.v90 +websphere_base_path: WAS/9.0.5ND +websphere_base_archive_list: + - was.repo.90500.nd.zip + +# Java Vars +websphere_java_path: Java/IBM/ibm-java-sdk-8.0-8.15-linux-x64-installmgr.zip +websphere_java_pid: com.ibm.java.jdk.v8 +websphere_java_home: java/8.0