Skip to content

Commit

Permalink
Merge pull request #634 from sap-linuxlab/dev
Browse files Browse the repository at this point in the history
collection: merge dev to main for release 1.4.0
  • Loading branch information
berndfinger authored Feb 2, 2024
2 parents 836015b + 8f460a5 commit 7720d7a
Show file tree
Hide file tree
Showing 108 changed files with 124 additions and 2,700 deletions.
2 changes: 0 additions & 2 deletions .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@ exclude_paths:
#- roles/sap_hana_install
#- roles/sap_hana_preconfigure
- roles/sap_hostagent
- roles/sap_hypervisor_node_preconfigure
#- roles/sap_install_media_detect
#- roles/sap_netweaver_preconfigure
#- roles/sap_storage_setup
#- roles/sap_swpm
- roles/sap_vm_preconfigure
- tests/
enable_list:
- yaml
Expand Down

This file was deleted.

33 changes: 0 additions & 33 deletions .github/workflows/ansible-lint-sap_vm_preconfigure.yml

This file was deleted.

11 changes: 11 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@ community.sap_install Release Notes
.. contents:: Topics


v1.4.0
======

Release Summary
---------------

| Release Date: 2024-02-02
| collection: Move sap_hypervisor_node_preconfigure Role to sap_infrastructure Collection
| collection: Move sap_vm_preconfigure Role to sap_infrastructure Collection
| sap_anydb_install_oracle: Feature add for Oracle DB install with patch
v1.3.5
======

Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,11 @@ Within this Ansible Collection, there are various Ansible Roles and no custom An
| [sap_hana_install](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_hana_install) | install SAP HANA via HDBLCM |
| [sap_hana_preconfigure](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_hana_preconfigure) | configure settings for SAP HANA database server |
| [sap_hostagent](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_hostagent) | install SAP Host Agent |
| [sap_hypervisor_node_preconfigure](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_hypervisor_node_preconfigure) | configure a hypervisor running VMs for SAP HANA |
| [sap_install_media_detect](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_install_media_detect) | detect and extract SAP Software installation media |
| [sap_maintain_etc_hosts](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_maintain_etc_hosts) | maintain the /etc/hosts file of an SAP software host |
| [sap_netweaver_preconfigure](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_netweaver_preconfigure) | configure settings for SAP NetWeaver application server |
| [sap_storage_setup](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_storage_setup) | configure storage for SAP HANA, with LVM partitions and XFS filesystem |
| [sap_swpm](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_swpm) | install SAP Software via SWPM |
| [sap_vm_preconfigure](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_vm_preconfigure) | configure settings for a guest (VM) running on RHV/KVM for SAP HANA |

## License

Expand Down
9 changes: 9 additions & 0 deletions changelogs/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,12 @@ releases:
| sap_hypervisor_node_preconfigure: Bug fix for role name and path for included tasks
'
release_date: '2024-01-31'
1.4.0:
changes:
release_summary: '| Release Date: 2024-02-02
| collection: Move sap_hypervisor_node_preconfigure Role to sap_infrastructure Collection
| collection: Move sap_vm_preconfigure Role to sap_infrastructure Collection
| sap_anydb_install_oracle: Feature add for Oracle DB install with patch
'
release_date: '2024-02-02'
2 changes: 0 additions & 2 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,8 @@ Important note: it is not possible for the project maintainers to test every SAP
| [sap_hana_install](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_hana_install) | [![Ansible Lint for sap_hana_install](https://github.com/sap-linuxlab/community.sap_install/actions/workflows/ansible-lint-sap_hana_install.yml/badge.svg)](https://github.com/sap-linuxlab/community.sap_install/actions/workflows/ansible-lint-sap_hana_install.yml) |
| [sap_hana_preconfigure](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_hana_preconfigure) | [![Ansible Lint for sap_hana_preconfigure](https://github.com/sap-linuxlab/community.sap_install/actions/workflows/ansible-lint-sap_hana_preconfigure.yml/badge.svg)](https://github.com/sap-linuxlab/community.sap_install/actions/workflows/ansible-lint-sap_hana_preconfigure.yml) |
| [sap_hostagent](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_hostagent) | N/A |
| [sap_hypervisor_node_preconfigure](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_hypervisor_node_preconfigure) | [![Ansible Lint for sap_hypervisor_node_preconfigure](https://github.com/sap-linuxlab/community.sap_install/actions/workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml/badge.svg)](https://github.com/sap-linuxlab/community.sap_install/actions/workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml) |
| [sap_install_media_detect](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_install_media_detect) | N/A |
| [sap_maintain_etc_hosts](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_maintain_etc_hosts) | [![Ansible Lint for sap_maintain_etc_hosts](https://github.com/sap-linuxlab/community.sap_install/actions/workflows/ansible-lint-sap_maintain_etc_hosts.yml/badge.svg)](https://github.com/sap-linuxlab/community.sap_install/actions/workflows/ansible-lint-sap_maintain_etc_hosts.yml) |
| [sap_netweaver_preconfigure](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_netweaver_preconfigure) | [![Ansible Lint for sap_netweaver_preconfigure](https://github.com/sap-linuxlab/community.sap_install/actions/workflows/ansible-lint-sap_netweaver_preconfigure.yml/badge.svg)](https://github.com/sap-linuxlab/community.sap_install/actions/workflows/ansible-lint-sap_netweaver_preconfigure.yml) |
| [sap_storage_setup](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_storage_setup) | N/A |
| [sap_swpm](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_swpm) | [![Ansible Lint for sap_swpm](https://github.com/sap-linuxlab/community.sap_install/actions/workflows/ansible-lint-sap_swpm.yml/badge.svg)](https://github.com/sap-linuxlab/community.sap_install/actions/workflows/ansible-lint-sap_swpm.yml) |
| [sap_vm_preconfigure](https://github.com/sap-linuxlab/community.sap_install/tree/main/roles/sap_vm_preconfigure) | N/A |
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace: community
name: sap_install

# The version of the collection. Must be compatible with semantic versioning
version: 1.3.5
version: 1.4.0

# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: README.md
Expand Down
12 changes: 0 additions & 12 deletions playbooks/sample-sap-hypervisor-redhat_ocp_virt-preconfigure.yml

This file was deleted.

This file was deleted.

6 changes: 6 additions & 0 deletions roles/sap_anydb_install_oracle/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,9 @@ sap_anydb_install_oracle_inventory_central: /oraInventory
sap_anydb_install_oracle_system_password:

sap_anydb_install_oracle_extract_path: # e.g. /software

sap_anydb_install_oracle_patch_opatch_zip: # e.g. OPATCH19P_2308-70004508.ZIP

sap_anydb_install_oracle_patch_sap_zip: # e.g. SAP19P_2311-70004508.ZIP

sap_anydb_install_oracle_patch_enable: false
5 changes: 3 additions & 2 deletions roles/sap_anydb_install_oracle/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
- name: Oracle DB - Installation
ansible.builtin.include_tasks: "oracledb_installer_{{ sap_anydb_install_oracle_method }}.yml"

#- name: Oracle DB - Post installation MOPatch
# ansible.builtin.include_tasks: "oracledb_install_post_mopatch.yml"
- name: Oracle DB - Post installation MOPatch
ansible.builtin.include_tasks: "oracledb_install_post_mopatch.yml"
when: (sap_anydb_install_oracle_patch_enable | bool)
Original file line number Diff line number Diff line change
@@ -1 +1,93 @@
---

- name: Oracle DB Patch - Copy the SBP
ansible.builtin.copy:
remote_src: true
directory_mode: true
src: "{{ sap_anydb_patch_oracle_sbp_path }}/"
dest: "{{ sap_anydb_install_oracle_base }}/tmp_sbp"
owner: oracle
group: oinstall
mode: '0774'

- name: Oracle DB Patch - Define vars to use in next tasks
ansible.builtin.set_fact:
current_datetime: "{{ lookup('pipe', 'date \"+%Y_%m_%d_%H_%M_%S\"') }}"
IHRDBMS: "{{ sap_anydb_install_oracle_base }}/{{ sap_anydb_install_oracle_sid }}/19.0.0"

- name: Oracle DB Patch - Creates the sapbundle dir
ansible.builtin.file:
path: "{{ IHRDBMS }}/sapbundle"
owner: oracle
group: oinstall
state: directory
mode: '0774'

- name: Oracle DB Patch - Move the old OPatch dir
ansible.builtin.shell: mv {{ IHRDBMS }}/OPatch {{ IHRDBMS }}/OPATCH_pre_SBP_{{ current_datetime }}
become_user: oracle

- name: Oracle DB Patch - Uncompress the patch files
become_user: oracle
ansible.builtin.unarchive:
src: "{{ sap_anydb_install_oracle_base }}/tmp_sbp/{{ item.source }}"
dest: "{{ item.destination }}"
remote_src: true
loop:
- source: "{{ sap_anydb_install_oracle_patch_opatch_zip }}"
destination: "{{ IHRDBMS }}"
- source: "{{ sap_anydb_install_oracle_patch_sap_zip }}"
destination: "{{ IHRDBMS }}/sapbundle"

- name: Oracle DB Patch - Move the old MOPatch dir if it exists and move sapbundle
ansible.builtin.shell: |
test -d {{ IHRDBMS }}/MOPatch && mv {{ IHRDBMS }}/MOPatch {{ IHRDBMS }}/MOPATCH_pre_SBP_{{ current_datetime }}
mv {{ IHRDBMS }}/sapbundle/*/MOPatch {{ IHRDBMS }}/MOPatch
become_user: oracle

# From the SAP Note 3263756 - (LINUX) Oracle Database 19c SBP fails during mopatch
- name: Oracle DB Patch - Fixes rights on oradism file before the mopatch
become: true
ansible.builtin.file:
path: "{{ sap_anydb_install_oracle_base }}/{{ sap_anydb_install_oracle_sid }}/19/bin/oradism"
owner: oracle
mode: '0750'

- name: Oracle DB Patch - Apply patches
become: true
become_user: oracle
args:
executable: /bin/csh
chdir: "{{ sap_anydb_install_oracle_base }}/tmp_sbp/"
register: __sap_anydb_patch_oracle_exec
changed_when: "'SAP RUNINSTALLER: Completed' in __sap_anydb_patch_oracle_exec.stdout"
failed_when: "__sap_anydb_patch_oracle_exec.rc not in [ 0, 1 ]"
ansible.builtin.shell: |
setenv ORACLE_BASE "{{ sap_anydb_install_oracle_base }}"
setenv DB_SID "{{ sap_anydb_install_oracle_sid }}"
setenv ORACLE_SID "{{ sap_anydb_install_oracle_sid }}"
setenv dbs_ora_tnsname "{{ sap_anydb_install_oracle_sid }}"
setenv ORACLE_HOME "$ORACLE_BASE/$DB_SID/19.0.0"
setenv SAPDATA_HOME "$ORACLE_BASE/$DB_SID/19.0.0"
setenv IHRDBMS "$ORACLE_HOME"
setenv OHRDBMS "$ORACLE_BASE/$DB_SID/19"
setenv dbms_type ORA
setenv GROUP dba
setenv LD_LIBRARY_PATH "$ORACLE_BASE/$DB_SID/19/lib"
setenv SBPFUSER /sbin/fuser
setenv PATH $PATH":$ORACLE_BASE/$DB_SID/19/bin"
$IHRDBMS/MOPatch/mopatch.sh -v -s {{ sap_anydb_install_oracle_patch_sap_zip }}
# From the SAP Note 3263756 - (LINUX) Oracle Database 19c SBP fails during mopatch
- name: Oracle DB Patch - Return rights on oradism file after the mopatch
become: true
ansible.builtin.file:
path: "{{ sap_anydb_install_oracle_base }}/{{ sap_anydb_install_oracle_sid }}/19/bin/oradism"
owner: root
group: oinstall
mode: '4750'

- name: Oracle DB Patch - Remove the temp dir
ansible.builtin.file:
path: "{{ sap_anydb_install_oracle_base }}/tmp_sbp"
state: absent
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
ignore_errors: true
ansible.builtin.shell: |
setenv DB_SID "{{ sap_anydb_install_oracle_sid }}"
export ORACLE_BASE="{{ sap_anydb_install_oracle_base }}"
setenv ORACLE_BASE "{{ sap_anydb_install_oracle_base }}"
setenv ORACLE_HOME "$ORACLE_BASE/$DB_SID/19.0.0"
set CURRENT_DATE_ISO=`date +%Y-%m-%d`
set ORACLEDB_RESP_GENERATED_FILE=`find $ORACLE_BASE -iname "db_$CURRENT_DATE_ISO*"`
Expand All @@ -93,7 +93,7 @@
- name: Oracle DB - Find log files
become_user: root
ansible.builtin.shell: |
ls -1 /oraInventory/logs/InstallActions*/installActions*
ls -1 {{ sap_anydb_install_oracle_inventory_central }}/logs/InstallActions*/installActions*
register: __sap_anydb_install_oracle_logs

- name: Oracle DB - View the following Oracle DB installation log files
Expand Down
Loading

0 comments on commit 7720d7a

Please sign in to comment.