Skip to content

Commit

Permalink
Oracle & WebLogic Middleware Update (#113)
Browse files Browse the repository at this point in the history
* Update IIM version, WAS & IHS to 9.0.5.212

Update to latest IBM Installation Manager - 1.10.1 (renamed molecule test)
Update WebSphere and IBM HTTP Server to v9.0.5.22 - new yaml files
Update READMEs
Update Molecule Tests
Update Galaxy file

* Update Github Workflow with new IIM name

Update Github Workflow with new IIM name

* Revert Back introduction of IIM 1.10.1 due to errors

Reverting back to IIM 1.9.3..

When using IIM 1.10.1 there were failures installing WebSphere Liberty...  Further investigation needed.. Will attach errors..

* Update the Java to the latest for WLP 24.0.0.12

Update the Java to the latest available for WLP 24.0.0.12 files

* Update Galaxy File

Update Galaxy File

* Test DB2 List Command

Test DB2 List Command

* Revert List Database Dir command test

Revert List Database Dir command test

* Oracle & WebLogic Middleware Update

New Oracle 19.26.0.0.0 yaml file
Update 19c molecule tests
Update README

Update to WebLogic 14.1.1.0.250108
Use Java 1.8.0_441
Update OPatch to 13.9.4.2.18
Update molecule tests

Update to OHS 12.2.1.4.250103
Updated Molecule Tests
Updated README

Update to WebLogic 12.2.1.4.250107

Update Galaxy.yml

---------

Co-authored-by: Martin Fanning <[email protected]>
  • Loading branch information
martinfanning1 and Martin Fanning authored Jan 24, 2025
1 parent 58ff833 commit 546b720
Show file tree
Hide file tree
Showing 19 changed files with 92 additions and 18 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.8.1
version: 1.8.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/__ohs-v12.2.1.4/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
name: weblogic
vars:
ansible_python_interpreter: /usr/bin/python3
weblogic_version: "14.1.1.0.240922"
weblogic_version: "14.1.1.0.250108"

- name: include ohs
include_role:
Expand Down
2 changes: 1 addition & 1 deletion molecule/__ohs-v12.2.1.4/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

pre_tasks:
- name: include vars
include_vars: "../../roles/ohs/vars/v12.2.1.4.240906.yml"
include_vars: "../../roles/ohs/vars/v12.2.1.4.250103.yml"

- name: include default
include_vars: "../../roles/ohs/defaults/main.yml"
Expand Down
2 changes: 1 addition & 1 deletion molecule/__oracle-v19c/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- merative.spm_middleware

vars:
oracle_version: 19.25.0.0.0
oracle_version: 19.26.0.0.0
download_url: "{{ lookup('env', 'ARTIFACTORY_URL') }}/{{ lookup('env', 'ARTIFACTORY_REPO') }}/SoftwareInstallers"
download_header: { 'X-JFrog-Art-Api': "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}"}

Expand Down
2 changes: 1 addition & 1 deletion molecule/__oracle-v19c/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
vars:
oracle_home: /opt/oracle/product/19c/dbhome_1
oracle_sid: orcl
oracle_version: 19.25.0.0.0
oracle_version: 19.26.0.0.0

pre_tasks:
- name: Check if DB exists
Expand Down
2 changes: 1 addition & 1 deletion molecule/__weblogic-v12.2/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- merative.spm_middleware

vars:
weblogic_version: "12.2.1.4.210716"
weblogic_version: "12.2.1.4.250107"
# weblogic_installer_path: /opt/IBM/weblogic/WLS
download_url: "{{ lookup('env','ARTIFACTORY_URL') }}/{{ lookup('env','ARTIFACTORY_REPO') }}/SoftwareInstallers"
download_header: {'X-JFrog-Art-Api': "{{ lookup('env','ARTIFACTORY_TOKEN' )}}"}
Expand Down
2 changes: 1 addition & 1 deletion molecule/__weblogic-v12.2/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
- name: include defaults
include_vars: "../../roles/weblogic/defaults/main.yml"
- name: include vars
include_vars: "../../roles/weblogic/vars/v12.2.1.4.210716.yml"
include_vars: "../../roles/weblogic/vars/v12.2.1.4.250107.yml"
- stat:
path: /opt/Props/AppServer.properties
register: boot_props
Expand Down
2 changes: 1 addition & 1 deletion molecule/__weblogic-v14.1/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- merative.spm_middleware

vars:
weblogic_version: "14.1.1.0.240922"
weblogic_version: "14.1.1.0.250108"
# weblogic_installer_path: /opt/IBM/weblogic/WLS
download_url: "{{ lookup('env','ARTIFACTORY_URL') }}/{{ lookup('env','ARTIFACTORY_REPO') }}/SoftwareInstallers"
download_header: {'X-JFrog-Art-Api': "{{ lookup('env','ARTIFACTORY_TOKEN' )}}"}
Expand Down
2 changes: 1 addition & 1 deletion molecule/__weblogic-v14.1/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
- name: include defaults
include_vars: "../../roles/weblogic/defaults/main.yml"
- name: include vars
include_vars: "../../roles/weblogic/vars/v14.1.1.0.240922.yml"
include_vars: "../../roles/weblogic/vars/v14.1.1.0.250108.yml"
- stat:
path: /opt/Props/AppServer.properties
register: boot_props
Expand Down
4 changes: 2 additions & 2 deletions roles/ohs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ NOTE: Update these default usernames and passwords after the initial installatio

| Property Name | Default value |
| ------------------------- | --------------------------------------------------- |
| `ohs_version` | `12.2.1.4.240906` |
| `ohs_version` | `12.2.1.4.250103` |
| `ohs_user` | `oracle` |
| `ohs_admin_password` | `password1` |
| `ohs_group` | `oinstall` |
Expand All @@ -41,7 +41,7 @@ Although the role can be used independently, it is expected that Weblogic is alr
- hosts: all
roles:
- role: merative.spm_middleware.ohs
ohs_version: 12.2.1.4.240906
ohs_version: 12.2.1.4.250103
```
## License

Expand Down
2 changes: 1 addition & 1 deletion roles/ohs/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# OHS config
ohs_version: 12.2.1.4.240906
ohs_version: 12.2.1.4.250103
ohs_user: oracle
ohs_admin_password: Password1
ohs_group: oinstall
Expand Down
33 changes: 33 additions & 0 deletions roles/ohs/vars/v12.2.1.4.250103.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
# Base Information
ohs_version_folder: 12.2.1
base_version: 12.2.1.4.0
base_installer: fmw_12.2.1.4.0_ohs_linux64.bin
base_installer_path: "OHS/12.2.1/fmw_12.2.1.4.0_ohs_linux64.bin"

# Upgrade Information
upgrade19c_version: 12.2.1.19.0
upgrade19c_installer_path: "OHS/12.2.1/19cUpgrade"
upgrade19c_installer_zip: "p34761383_122140_Linux-x86-64.zip"
upgrade19c_installer: fmw_12.2.1.19.0_dbclient_linux64.bin
upgrade19c_installer_folder: 34761383

# Patch information
ohs_version: 12.2.1.4.250103
patches:
- filename: "OHS/{{ ohs_version_folder }}/p37443574_122140_Linux-x86-64.zip"
number: 37443574
- filename: "OHS/{{ ohs_version_folder }}/p35333510_122140_Linux-x86-64.zip"
number: 35037811

# OPatch Information
opatch_filename_path: "WLS/Patches/p28186730_1394218_Generic.zip"
opatch_version: 13.9.4.2.18
opatch_folder: 6880880

# JDK Information
java_zip_path: 'WLS/jdk-8u441-linux-x64.tar.gz'
java_version_path: 'jdk1.8.0_441'
jdk_folder: "{{ ohs_home }}/oracle_common/jdk"

template_jar: "ohs_standalone_template.jar"
4 changes: 2 additions & 2 deletions roles/oracle/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The `oracle` role will install Oracle Database EE Single Instance.

| Property Name | Default value |
| ------------------------- | --------------------------------------------------- |
| `oracle_version` | `19.25.0.0.0` |
| `oracle_version` | `19.26.0.0.0` |
| `oracle_base` | `/opt/oracle` |
| `oracle_home` | `/opt/oracle/product/<oracle_family>/dbhome_1` |
| `oracle_inventory` | `/opt/Oracle/oraInventory` |
Expand Down Expand Up @@ -42,7 +42,7 @@ None
- hosts: servers
roles:
- role: merative.spm_middleware.oracle
oracle_version: 19.25.0.0.0
oracle_version: 19.26.0.0.0
## License
Expand Down
2 changes: 1 addition & 1 deletion roles/oracle/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ travis_build: "{{ lookup('env', 'CI') }}"
travis_flags: "{{'-force -ignoresysprereqs -ignoreprereq' if lookup('env', 'CI') is defined else ''}}"

# Oracle config
oracle_version: 19.25.0.0.0
oracle_version: 19.26.0.0.0
oracle_family: "{{ oracle_version.split('.') | first }}c"
oracle_base: /opt/oracle
oracle_home: "/opt/oracle/product/{{ oracle_family }}/dbhome_1"
Expand Down
14 changes: 14 additions & 0 deletions roles/oracle/vars/v19.26.0.0.0.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
# prereq installers
prereqs_installer_7: https://yum.oracle.com/repo/OracleLinux/OL7/latest/x86_64/getPackage/oracle-database-preinstall-19c-1.0-1.el7.x86_64.rpm
prereqs_installer_8: https://yum.oracle.com/repo/OracleLinux/OL8/appstream/x86_64/getPackage/oracle-database-preinstall-19c-1.0-2.el8.x86_64.rpm
prereqs_installer: "{{ prereqs_installer_7 if ansible_distribution_major_version=='7' else prereqs_installer_8 }}"
# base installer values
base_version: 19.3.0.0.0
base_installer: oracle-database-ee-19c-1.0-1.x86_64.rpm
# patch values
patch_filename: p37260974_190000_Linux-x86-64.zip
patch_number: 37260974 # used for directory
# Add OPatch values when bundled OPatch needs to be upgraded
opatch_filename: p6880880_190000_Linux-x86-64.zip
opatch_version: 12.2.0.1.45
6 changes: 4 additions & 2 deletions roles/weblogic/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ The `weblogc` role will install Weblogic.
| | `14.1.1.0.220105` |
| | `14.1.1.0.240111` |
| | `14.1.1.0.240922` |

| | `14.1.1.0.250108` |
| | |
| ------------------------- | --------------------------------------------------- |

...

Expand All @@ -52,7 +54,7 @@ The version of the OPatch tool itself is also handed by the above tasks file.
- hosts: servers
roles:
- role: merative.spm_middleware.weblogic
weblogic_version: 14.1.1.0.240922
weblogic_version: 14.1.1.0.250108
```

## Note
Expand Down
2 changes: 1 addition & 1 deletion roles/weblogic/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ weblogic_group: 'oinstall'
weblogic_os_user_pass: 'oracle'
weblogic_base: '/home/oracle'
# If not passed in, use this default value
weblogic_version: '14.1.1.0.240922'
weblogic_version: '14.1.1.0.250108'
inv_loc: '/opt/Oracle/oraInventory'
jdk_folder: '/usr/java'
# Common paths and names
Expand Down
14 changes: 14 additions & 0 deletions roles/weblogic/vars/v12.2.1.4.250107.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
base_install_file: 'fmw_12.2.1.4.0_wls.jar'
weblogic_version: 12.2
# 13.9.4.2.18
opatch: 'p28186730_1394218_Generic.zip'
opatch_version: 13.9.4.2.18
# 12.2.1.4.250107
patch: 'p37453807_122140_Generic.zip'
patch_number: 37453807
napply: false
patch_folder: '37453807'
# Local controller path OR relative path to download_url
java_archive_file: jdk-8u441-linux-x64.tar.gz
java_version_path: 'jdk1.8.0_441'
11 changes: 11 additions & 0 deletions roles/weblogic/vars/v14.1.1.0.250108.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
base_install_file: 'fmw_14.1.1.0.0_wls.jar'
weblogic_version: 14.1
opatch: 'p28186730_1394218_Generic.zip'
opatch_version: 13.9.4.2.18
patch: 'p37458537_141100_Generic.zip'
patch_number: 37458537
napply: False
patch_folder: '37458537'
java_archive_file: jdk-8u441-linux-x64.tar.gz
java_version_path: 'jdk1.8.0_441'

0 comments on commit 546b720

Please sign in to comment.