Skip to content

Commit

Permalink
IBM Fixpack Role Updates (#73) (#74)
Browse files Browse the repository at this point in the history
Co-authored-by: martinfanning1 <[email protected]>
Co-authored-by: Martin Fanning <[email protected]>
  • Loading branch information
3 people authored Apr 8, 2024
1 parent 2bdcc54 commit a643bd8
Show file tree
Hide file tree
Showing 18 changed files with 126 additions and 19 deletions.
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion molecule/__ihs-v90/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}"}

Expand Down
4 changes: 2 additions & 2 deletions molecule/__websphere-v90/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}"}

Expand Down
14 changes: 14 additions & 0 deletions molecule/db21159/converge.yml
Original file line number Diff line number Diff line change
@@ -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') }}"}
34 changes: 34 additions & 0 deletions molecule/db21159/molecule.yml
Original file line number Diff line number Diff line change
@@ -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
22 changes: 22 additions & 0 deletions molecule/db21159/verify.yml
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion molecule/iim-191-rockylinux8/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' )}}"}
4 changes: 2 additions & 2 deletions roles/db2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
| ------------------------- | --------------------------------------------------- |
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion roles/db2/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions roles/db2/vars/v11.5.9.0.yml
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions roles/ihs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
| ----------------------- | --------------------------------------------------- |
Expand Down Expand Up @@ -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'}
```
Expand Down
2 changes: 1 addition & 1 deletion roles/ihs/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 16 additions & 0 deletions roles/ihs/vars/v9.0.5.19.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion roles/iim/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand Down
2 changes: 1 addition & 1 deletion roles/iim/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/websphere/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand All @@ -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'}
Expand Down
2 changes: 1 addition & 1 deletion roles/websphere/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 17 additions & 0 deletions roles/websphere/vars/v9.0.5.19.yml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit a643bd8

Please sign in to comment.