From 1e4d51b5f114d4d3957c2968ee718c9082fb0b1a Mon Sep 17 00:00:00 2001 From: robertsweetman Date: Thu, 18 Apr 2024 16:24:16 +0100 Subject: [PATCH 1/6] add onr_db_test script for possible db for testing --- .../group_vars/server_type_onr_db_test.yml | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 ansible/group_vars/server_type_onr_db_test.yml diff --git a/ansible/group_vars/server_type_onr_db_test.yml b/ansible/group_vars/server_type_onr_db_test.yml new file mode 100644 index 000000000..a8e4887a7 --- /dev/null +++ b/ansible/group_vars/server_type_onr_db_test.yml @@ -0,0 +1,73 @@ +--- +ansible_python_interpreter: /usr/bin/python3.9 + +users_and_groups_system: + - name: oracle + group: oinstall + groups: + - dba + - wheel + +roles_list: + - users-and-groups + - sudoers + - get-ec2-facts + - set-ec2-hostname + - domain-search + - disable-ipv6 + - disable-firewall + - time + - packages + - message-of-the-day + - amazon-ssm-agent + - amazon-cli + - ansible-script + - epel + - disks + - azcopy + - oracle-19c + - oracle-secure-backup + - oracle-db-backup + - oracle-db-housekeeping + # - collectd # don't need all the monitoring for testing + # - amazon-cloudwatch-agent + # - amazon-cloudwatch-agent-collectd + # - collectd-service-metrics + # - collectd-oracle-db-connected + # - collectd-textfile-monitoring + +packages_yum_install: + - zip-3.0-23.el8 + - git + - tar + +# Storage: volumes, partitioning and mounting +disks_partition: + - ebs_device_name: /dev/sde + oracle_group: data + oracle_label: DATA01 + - ebs_device_name: /dev/sdj + oracle_group: flash + oracle_label: FLASH01 + +disks_mount: + - ebs_device_name: /dev/sdb + dir: /u01 + fstype: xfs + - ebs_device_name: /dev/sdc + dir: /u02 + fstype: xfs + - ebs_device_name: /dev/sds + dir: swap + fstype: swap + +# Oracle common variables +oracle_install_user: oracle +oracle_install_group: oinstall +oracle_inventory: /u01/app/oraInventory +database_home: /u01/app/oracle/product/19c/db_1 +grid_home: /u01/app/oracle/product/19c/gridhome_1 + +# NOTE: copied from ansible/group_vars/server_type_ncr_db.yml + +# tns_entries: From 1297eef9f677cec80bd9183da6dfab69671d5a3b Mon Sep 17 00:00:00 2001 From: robertsweetman Date: Thu, 18 Apr 2024 16:52:09 +0100 Subject: [PATCH 2/6] formatting --- ansible/roles/onr-boe/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/roles/onr-boe/tasks/main.yml b/ansible/roles/onr-boe/tasks/main.yml index 63a284ef0..344cca62b 100644 --- a/ansible/roles/onr-boe/tasks/main.yml +++ b/ansible/roles/onr-boe/tasks/main.yml @@ -42,6 +42,7 @@ tags: - amibuild - ec2provision + # - import_tasks: install-boe.yml # tags: # - amibuild From 0e7e64b052c337569a8b90e1571cd1fa977ca488 Mon Sep 17 00:00:00 2001 From: robertsweetman Date: Thu, 18 Apr 2024 18:13:19 +0100 Subject: [PATCH 3/6] increase async timeout --- ansible/roles/oracle-12c-client/tasks/install_client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/oracle-12c-client/tasks/install_client.yml b/ansible/roles/oracle-12c-client/tasks/install_client.yml index 5ad6b7164..8fc18f9bd 100644 --- a/ansible/roles/oracle-12c-client/tasks/install_client.yml +++ b/ansible/roles/oracle-12c-client/tasks/install_client.yml @@ -57,7 +57,7 @@ } main 2>&1 | logger -p local3.info -t ansible-oracle-client become_user: oracle - async: 2400 + async: 4800 poll: 30 ignore_errors: true # ignore errors as the installation may return SUCCESS_WITH_ERRORS which is not a failure but the installer return code is non-zero From 830cbdb045296b797cdf450b6ed28df085e60d94 Mon Sep 17 00:00:00 2001 From: robertsweetman Date: Fri, 19 Apr 2024 08:05:48 +0100 Subject: [PATCH 4/6] remove debug --- ansible/roles/oracle-12c-client/tasks/install_client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/oracle-12c-client/tasks/install_client.yml b/ansible/roles/oracle-12c-client/tasks/install_client.yml index 8fc18f9bd..43954d5d8 100644 --- a/ansible/roles/oracle-12c-client/tasks/install_client.yml +++ b/ansible/roles/oracle-12c-client/tasks/install_client.yml @@ -53,7 +53,7 @@ ansible.builtin.shell: | set -eo pipefail main() { - {{ oracle_home }}/client/runInstaller -silent -debug -waitforcompletion -ignorePrereqFailure -logLevel fine -responseFile {{ stage }}/{{ client_response_file }} + {{ oracle_home }}/client/runInstaller -silent -waitforcompletion -ignorePrereqFailure -responseFile {{ stage }}/{{ client_response_file }} } main 2>&1 | logger -p local3.info -t ansible-oracle-client become_user: oracle From 3e496ba1c82456e3fa264d857ea4fd561687e502 Mon Sep 17 00:00:00 2001 From: robertsweetman Date: Fri, 19 Apr 2024 08:40:11 +0100 Subject: [PATCH 5/6] use correct flag --- ansible/roles/oracle-12c-client/tasks/install_client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/oracle-12c-client/tasks/install_client.yml b/ansible/roles/oracle-12c-client/tasks/install_client.yml index 43954d5d8..c79603cf9 100644 --- a/ansible/roles/oracle-12c-client/tasks/install_client.yml +++ b/ansible/roles/oracle-12c-client/tasks/install_client.yml @@ -53,7 +53,7 @@ ansible.builtin.shell: | set -eo pipefail main() { - {{ oracle_home }}/client/runInstaller -silent -waitforcompletion -ignorePrereqFailure -responseFile {{ stage }}/{{ client_response_file }} + {{ oracle_home }}/client/runInstaller -silent -waitforcompletion -ignoreSysPrereqs -responseFile {{ stage }}/{{ client_response_file }} } main 2>&1 | logger -p local3.info -t ansible-oracle-client become_user: oracle From 452741c12eb0ef1d8c8668cde6aea4ff064b3f14 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 19 Apr 2024 08:57:38 +0000 Subject: [PATCH 6/6] Commit changes made by code formatters --- ansible/group_vars/server_type_onr_db_test.yml | 1 - ansible/roles/onr-boe/tasks/main.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/ansible/group_vars/server_type_onr_db_test.yml b/ansible/group_vars/server_type_onr_db_test.yml index a8e4887a7..fe3983bb5 100644 --- a/ansible/group_vars/server_type_onr_db_test.yml +++ b/ansible/group_vars/server_type_onr_db_test.yml @@ -67,7 +67,6 @@ oracle_install_group: oinstall oracle_inventory: /u01/app/oraInventory database_home: /u01/app/oracle/product/19c/db_1 grid_home: /u01/app/oracle/product/19c/gridhome_1 - # NOTE: copied from ansible/group_vars/server_type_ncr_db.yml # tns_entries: diff --git a/ansible/roles/onr-boe/tasks/main.yml b/ansible/roles/onr-boe/tasks/main.yml index 344cca62b..63a284ef0 100644 --- a/ansible/roles/onr-boe/tasks/main.yml +++ b/ansible/roles/onr-boe/tasks/main.yml @@ -42,7 +42,6 @@ tags: - amibuild - ec2provision - # - import_tasks: install-boe.yml # tags: # - amibuild