Skip to content

Commit

Permalink
April 2022 release (#202)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sabrina-yee
sabrina-yee authored Apr 2, 2022
1 parent 64b6dd9 commit 96ab0c5
Show file tree
Hide file tree
Showing 25 changed files with 127 additions and 141 deletions.
4 changes: 2 additions & 2 deletions documentation/VARIABLES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Name | Default | Description
was_repository_url | *none* - required | WebSphere install kit download location
was_fixes_repository_url | *none* - required | WebSphere Fix Pack kit location to download
was_version | 8.5.5000.20130514_1044 | WebSphere Base version
was_fp_version | 8.5.5020.20210708_1826 | WebSphere Fix Pack version
was_fp_version | 8.5.5021.20220202_1245 | WebSphere Fix Pack version
java_version | 8.0.6015.20200826_0935 | (only for Java upgrade during FP16/18 install)
was_username | wasadmin | WAS admin user
was_password | password | WAS admin user password
Expand All @@ -149,7 +149,7 @@ Name | Default | Description
---- | --------| -------------
ihs_repository_url | *none* - required | IHS install kit download location
ihs_fixes_repository_url | *none* - required | IHS Fix Pack kit location to download
ihs_version | 8.5.5020.20210708_1826 | IHS Fix Pack version
ihs_version | 8.5.5021.20220202_1245 | IHS Fix Pack version
ihs_username | ihsadmin | IHS admin user
ihs_password | *none* - required | IHS admin user password
plg_install_location | /opt/IBM/WebSphere/Plugins | IBM WebSphere Plugin installation folder path
Expand Down
121 changes: 38 additions & 83 deletions documentation/howtos/connections_upgrade.md
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions environments/examples/cnx6/db2/group_vars/all.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ tdi_download_location: http://{{ groups['installer'][0
connections_wizards_download_location: http://{{ groups['installer'][0] }}:8001/Connections6.5
iim_repository_url: http://{{ groups['installer'][0] }}:8001/was855
was_repository_url: http://{{ groups['installer'][0] }}:8001/was855
was_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP20
was_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP21
ihs_repository_url: http://{{ groups['installer'][0] }}:8001/was855
ihs_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP20
ihs_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP21
cnx_docs_download_location: http://{{ groups['installer'][0] }}:8001/Docs
cnx_repository_url: http://{{ groups['installer'][0] }}:8001/Connections6.5
cnx_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/Connections6.5CR1
Expand Down
4 changes: 2 additions & 2 deletions environments/examples/cnx7/db2/group_vars/all.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ tdi_download_location: http://{{ groups['installer'][0
connections_wizards_download_location: http://{{ groups['installer'][0] }}:8001/Connections7
iim_repository_url: http://{{ groups['installer'][0] }}:8001/was855
was_repository_url: http://{{ groups['installer'][0] }}:8001/was855
was_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP20
was_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP21
ihs_repository_url: http://{{ groups['installer'][0] }}:8001/was855
ihs_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP20
ihs_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP21
cnx_docs_download_location: http://{{ groups['installer'][0] }}:8001/Docs
cnx_repository_url: http://{{ groups['installer'][0] }}:8001/Connections7
component_pack_download_location: http://{{ groups['installer'][0] }}:8001/cp
Expand Down
4 changes: 2 additions & 2 deletions environments/examples/cnx7/flexnet_db2/group_vars/all.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ tdi_download_location: http://{{ groups['installer'][0
connections_wizards_download_location: http://{{ groups['installer'][0] }}:8001/Connections7
iim_repository_url: http://{{ groups['installer'][0] }}:8001/was855
was_repository_url: http://{{ groups['installer'][0] }}:8001/was855
was_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP20
was_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP21
ihs_repository_url: http://{{ groups['installer'][0] }}:8001/was855
ihs_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP20
ihs_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP21
cnx_docs_download_location: http://{{ groups['installer'][0] }}:8001/Docs
cnx_repository_url: http://{{ groups['installer'][0] }}:8001/Connections7
component_pack_download_location: http://{{ groups['installer'][0] }}:8001/cp
Expand Down
4 changes: 2 additions & 2 deletions environments/examples/cnx7/mssql/group_vars/all.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ tdi_download_location: http://{{ groups['installer'][0
connections_wizards_download_location: http://{{ groups['installer'][0] }}:8001/Connections7
iim_repository_url: http://{{ groups['installer'][0] }}:8001/was855
was_repository_url: http://{{ groups['installer'][0] }}:8001/was855
was_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP20
was_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP21
ihs_repository_url: http://{{ groups['installer'][0] }}:8001/was855
ihs_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP20
ihs_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP21
cnx_docs_download_location: http://{{ groups['installer'][0] }}:8001/Docs
cnx_repository_url: http://{{ groups['installer'][0] }}:8001/Connections7
component_pack_download_location: http://{{ groups['installer'][0] }}:8001/cp
Expand Down
4 changes: 2 additions & 2 deletions environments/examples/cnx7/oracle/group_vars/all.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ tdi_download_location: http://{{ groups['installer'][0
connections_wizards_download_location: http://{{ groups['installer'][0] }}:8001/Connections7
iim_repository_url: http://{{ groups['installer'][0] }}:8001/was855
was_repository_url: http://{{ groups['installer'][0] }}:8001/was855
was_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP20
was_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP21
ihs_repository_url: http://{{ groups['installer'][0] }}:8001/was855
ihs_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP20
ihs_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP21
cnx_docs_download_location: http://{{ groups['installer'][0] }}:8001/Docs
cnx_repository_url: http://{{ groups['installer'][0] }}:8001/Connections7
component_pack_download_location: http://{{ groups['installer'][0] }}:8001/cp
Expand Down
4 changes: 2 additions & 2 deletions environments/examples/cnx7/quick_start/group_vars/all.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ tdi_download_location: http://{{ groups['installer'][0
connections_wizards_download_location: http://{{ groups['installer'][0] }}:8001/Connections7
iim_repository_url: http://{{ groups['installer'][0] }}:8001/was855
was_repository_url: http://{{ groups['installer'][0] }}:8001/was855
was_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP20
was_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP21
ihs_repository_url: http://{{ groups['installer'][0] }}:8001/was855
ihs_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP20
ihs_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP21
cnx_docs_download_location: http://{{ groups['installer'][0] }}:8001/Docs
cnx_repository_url: http://{{ groups['installer'][0] }}:8001/Connections7
component_pack_download_location: http://{{ groups['installer'][0] }}:8001/cp
Expand Down
4 changes: 2 additions & 2 deletions environments/examples/existing_database/db2/group_vars/all.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ tdi_download_location: http://{{ groups['installer'][0
connections_wizards_download_location: http://{{ groups['installer'][0] }}:8001/Connections7
iim_repository_url: http://{{ groups['installer'][0] }}:8001/was855
was_repository_url: http://{{ groups['installer'][0] }}:8001/was855
was_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP20
was_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP21
ihs_repository_url: http://{{ groups['installer'][0] }}:8001/was855
ihs_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP20
ihs_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP21
cnx_docs_download_location: http://{{ groups['installer'][0] }}:8001/Docs
cnx_repository_url: http://{{ groups['installer'][0] }}:8001/Connections7
component_pack_download_location: http://{{ groups['installer'][0] }}:8001/cp
Expand Down
4 changes: 2 additions & 2 deletions environments/examples/existing_database/mssql/group_vars/all.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ tdi_download_location: http://{{ groups['installer'][0
connections_wizards_download_location: http://{{ groups['installer'][0] }}:8001/Connections7
iim_repository_url: http://{{ groups['installer'][0] }}:8001/was855
was_repository_url: http://{{ groups['installer'][0] }}:8001/was855
was_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP20
was_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP21
ihs_repository_url: http://{{ groups['installer'][0] }}:8001/was855
ihs_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP20
ihs_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP21
cnx_docs_download_location: http://{{ groups['installer'][0] }}:8001/Docs
cnx_repository_url: http://{{ groups['installer'][0] }}:8001/Connections7
component_pack_download_location: http://{{ groups['installer'][0] }}:8001/cp
Expand Down
4 changes: 2 additions & 2 deletions environments/examples/existing_database/oracle/group_vars/all.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ tdi_download_location: http://{{ groups['installer'][0
connections_wizards_download_location: http://{{ groups['installer'][0] }}:8001/Connections7
iim_repository_url: http://{{ groups['installer'][0] }}:8001/was855
was_repository_url: http://{{ groups['installer'][0] }}:8001/was855
was_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP20
was_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP21
ihs_repository_url: http://{{ groups['installer'][0] }}:8001/was855
ihs_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP20
ihs_fixes_repository_url: http://{{ groups['installer'][0] }}:8001/was855FP21
cnx_docs_download_location: http://{{ groups['installer'][0] }}:8001/Docs
cnx_repository_url: http://{{ groups['installer'][0] }}:8001/Connections7
component_pack_download_location: http://{{ groups['installer'][0] }}:8001/cp
Expand Down
20 changes: 0 additions & 20 deletions playbooks/hcl/fixup/component-pack-configure-es.yml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion roles/hcl/component-pack/tasks/setup_bootstrap.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- name: Check Helm Version
shell: helm version -c|awk -F "," '{print $1}'|awk -F ":" '{print $3}'|awk -F "." '{print $1}'|sed "s/\"//g"
shell: helm version --short|awk -F "," '{print $1}'|awk -F ":" '{print $1}'|awk -F "." '{print $1}'|sed "s/\"//g"
changed_when: true
register: helm_version
become_user: "{{ __sudo_user }}"
Expand Down
4 changes: 1 addition & 3 deletions roles/hcl/component-pack/tasks/setup_community_ingress.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
run_once: true

- name: Check Helm Verion
shell: helm version -s|awk -F "," '{print $1}'|awk -F ":" '{print $3}'|awk -F "." '{print $1}'|sed "s/\"//g"
when:
- ("api." not in cluster_flavor_check.stdout)
shell: helm version --short|awk -F "," '{print $1}'|awk -F ":" '{print $1}'|awk -F "." '{print $1}'|sed "s/\"//g"
changed_when: true
register: helm_version
become_user: "{{ __sudo_user }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/hcl/component-pack/tasks/setup_orientme.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
become_user: "{{ __sudo_user }}"

- name: Check Helm Version
shell: helm version -c|awk -F "," '{print $1}'|awk -F ":" '{print $3}'|awk -F "." '{print $1}'|sed "s/\"//g"
shell: helm version --short|awk -F "," '{print $1}'|awk -F ":" '{print $1}'|awk -F "." '{print $1}'|sed "s/\"//g"
changed_when: true
register: helm_version
become: false
Expand Down
4 changes: 2 additions & 2 deletions roles/third_party/helm-install/tasks/init_helm.yml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- name: Check Helm Version
shell: helm version -c|awk -F "," '{print $1}'|awk -F ":" '{print $3}'|awk -F "." '{print $1}'|sed "s/\"//g"
shell: helm version --short|awk -F "," '{print $1}'|awk -F ":" '{print $1}'|awk -F "." '{print $1}'|sed "s/\"//g"
changed_when: true
register: helm_version
become: false
ignore_errors: true

- name: Check Helm Version
shell: helm version -c|awk -F "," '{print $1}'|cut -d ":" -f 3|sed "s/\"//g"|sed "s/v//g"
shell: helm version --short|awk -F "," '{print $1}'|awk -F ":" '{print $1}'|awk -F "." '{print $1}'|sed "s/\"//g"|sed "s/v//g"
changed_when: true
register: helm_ver
become: false
Expand Down
7 changes: 7 additions & 0 deletions roles/third_party/ibm/ihs/ibm-http-server-fix-install/tasks/define_vars.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
---
- name: Use Fix Pack 21?
set_fact:
__ihs_fp_files: "{{ __ihs_fp_files_fp21 }}"
__ihs_version_check: "Updated to com.ibm.websphere.IHS.v85_{{ __ihs_version }}"
__ihs_version_id: "\"id='com.ibm.websphere.IHS.v85' version='{{ __ihs_version }}'\""
when: ( __ihs_version == __ihs_fp_version_fp21 )

- name: Use Fix Pack 20?
set_fact:
__ihs_fp_files: "{{ __ihs_fp_files_fp20 }}"
Expand Down
10 changes: 8 additions & 2 deletions roles/third_party/ibm/ihs/ibm-http-server-fix-install/vars/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,14 @@ __rsp_file: "{{ __logs_dir }}/ihs_plg_wct_fixes.rsp"
__log_file: "{{ __logs_dir }}/ihs_fixes_install.{{ __now }}.log"
__tpl_file: "ihs_plg_wct_fixes.rsp.j2"

__ihs_fp_version_latest: "{{ ihs_fp_version_latest | default( __ihs_fp_version_fp20 ) }}"
__ihs_fp_files_latest: "{{ ihs_fp_files_latest | default( __ihs_fp_files_fp20 ) }}"
__ihs_fp_version_latest: "{{ ihs_fp_version_latest | default( __ihs_fp_version_fp21 ) }}"
__ihs_fp_files_latest: "{{ ihs_fp_files_latest | default( __ihs_fp_files_fp21 ) }}"

__ihs_fp_version_fp21: "8.5.5021.20220202_1245"
__ihs_fp_files_fp21:
- { file_name: 8.5.5-WS-WASSupplements-FP021-part1.zip }
- { file_name: 8.5.5-WS-WASSupplements-FP021-part2.zip }
- { file_name: 8.5.5-WS-WASSupplements-FP021-part3.zip }

__ihs_fp_version_fp20: "8.5.5020.20210708_1826"
__ihs_fp_files_fp20:
Expand Down
3 changes: 2 additions & 1 deletion roles/third_party/ibm/wasnd/was-java-install/vars/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ __iim_keep_fetched_files: "{{ iim_keep_fetched_files | default(false) }}"
__iim_preserve_artifacts: "{{ iim_preserve_artifacts | default(false) }}"

__was_fixes_version: "{{ was_fp_version | default( __was_fp_version_latest ) }}"
__was_fp_version_latest: "{{ was_fp_version_latest | default( __was_fp_version_fp20 ) }}"
__was_fp_version_latest: "{{ was_fp_version_latest | default( __was_fp_version_fp21 ) }}"
__was_fp_version_fp20: "8.5.5020.20210708_1826"
__was_fp_version_fp19: "8.5.5019.20210118_0346"
__was_fp_version_fp21: "8.5.5021.20220202_1245"
7 changes: 7 additions & 0 deletions roles/third_party/ibm/wasnd/was-nd-fix-install/tasks/define_vars.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
---
- name: Use Fix Pack 8.5.5.21?
set_fact:
__was_fixes_files: "{{ __was_fp_files_fp21 }}"
__was_fp_version_check: "Updated to com.ibm.websphere.ND.v85_{{ __was_fixes_version }}"
__was_fp_id: "\"id='com.ibm.websphere.ND.v85' version='{{ __was_fixes_version }}'\""
when: ( __was_fixes_version == __was_fp_version_fp21 )

- name: Use Fix Pack 8.5.5.20?
set_fact:
__was_fixes_files: "{{ __was_fp_files_fp20 }}"
Expand Down
10 changes: 8 additions & 2 deletions roles/third_party/ibm/wasnd/was-nd-fix-install/vars/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,19 @@ __rsp_file: "{{ __logs_dir }}/was_nd_fixes.rsp"
__log_file: "{{ __logs_dir }}/was_nd_fixes_install.{{ __now }}.log"
__tpl_file: "was_nd_fixes.rsp.j2"

__was_fp_version_latest: "{{ was_fp_version_latest | default( __was_fp_version_fp20 ) }}"
__was_fp_files_latest: "{{ was_fp_files_latest | default( __was_fp_files_fp20 ) }}"
__was_fp_version_latest: "{{ was_fp_version_latest | default( __was_fp_version_fp21 ) }}"
__was_fp_files_latest: "{{ was_fp_files_latest | default( __was_fp_files_fp21 ) }}"

__was_fp_version_log4j: "8.5.5011.20211215_1027"
__was_fp_files_log4j:
- { file_name: 8.5.5.11-ws-wasprod-ifph42762.zip }

__was_fp_version_fp21: "8.5.5021.20220202_1245"
__was_fp_files_fp21:
- { file_name: 8.5.5-WS-WAS-FP021-part1.zip }
- { file_name: 8.5.5-WS-WAS-FP021-part2.zip }
- { file_name: 8.5.5-WS-WAS-FP021-part3.zip }

__was_fp_version_fp20: "8.5.5020.20210708_1826"
__was_fp_files_fp20:
- { file_name: 8.5.5-WS-WAS-FP020-part1.zip }
Expand Down
Loading

0 comments on commit 96ab0c5

Please sign in to comment.