From 5dfdbda8459c63858458683bc820cc7ff2246037 Mon Sep 17 00:00:00 2001 From: Thorsten Bruhns Date: Sat, 14 Sep 2024 17:06:19 +0000 Subject: [PATCH] molecule: added 2nd listener for testing --- changelogs/fragments/sqlnet_molecule.yml | 3 + extensions/molecule/dbfs/molecule.yml | 1 + .../inventory/group_vars/all/oracle_db.yml | 118 +----------------- .../inventory/host_vars/dbfs.yml | 113 +++++++++++++++++ 4 files changed, 123 insertions(+), 112 deletions(-) create mode 100644 changelogs/fragments/sqlnet_molecule.yml create mode 100644 extensions/molecule/shared_config/inventory/host_vars/dbfs.yml diff --git a/changelogs/fragments/sqlnet_molecule.yml b/changelogs/fragments/sqlnet_molecule.yml new file mode 100644 index 000000000..07c82e123 --- /dev/null +++ b/changelogs/fragments/sqlnet_molecule.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - "molecule: added 2nd listener for testing (oravirt#475)" diff --git a/extensions/molecule/dbfs/molecule.yml b/extensions/molecule/dbfs/molecule.yml index 39e73b6f9..831ab2c21 100644 --- a/extensions/molecule/dbfs/molecule.yml +++ b/extensions/molecule/dbfs/molecule.yml @@ -25,3 +25,4 @@ provisioner: inventory: links: group_vars: ../shared_config/inventory/group_vars/ + host_vars: ../shared_config/inventory/host_vars/ diff --git a/extensions/molecule/shared_config/inventory/group_vars/all/oracle_db.yml b/extensions/molecule/shared_config/inventory/group_vars/all/oracle_db.yml index e2dffa6fb..d0efbf812 100644 --- a/extensions/molecule/shared_config/inventory/group_vars/all/oracle_db.yml +++ b/extensions/molecule/shared_config/inventory/group_vars/all/oracle_db.yml @@ -63,129 +63,23 @@ db_homes_config: oracle_listeners_config: LISTENER: - home: db19-si-ee address: - host: "{{ ansible_hostname }}" protocol: TCP port: 1521 + LISTENER1522: + address: + - host: "{{ ansible_hostname }}" + protocol: TCP + port: 1522 listener_installed: - home: db19-si-ee listener_name: LISTENER state: present - -oracle_databases: - - home: db19-si-ee - oradb_facts_ignore_unreachable: true - oracle_db_name: &oracle_db_name DB1 - oracle_db_type: SI - is_container: true - storage_type: FS - oracle_database_type: MULTIPURPOSE - redolog_size: 50M - redolog_groups: 3 - datafile_dest: /u01/app/oracle/oradata - recoveryfile_dest: /u01/app/oracle//fra - listener_name: LISTENER - listener_port: &cdb_listener_port 1521 - # *local_listener is used in initparam as an achor - local_listener: &local_listener "{{ ansible_hostname }}:1521" - archivelog: false - flashback: false - force_logging: true - state: present - statspack: - purgedays: 14 - snaplevel: 7 - tablespace: PERFSTAT - state: present - tablespaces: - - name: PERFSTAT - size: 10M - autoextend: true - next: 50M - maxsize: 4G - content: permanent - state: present - init_parameters: - - {name: db_create_file_dest, value: '/u01/app/oracle/oradata', scope: both, state: present} - - {name: db_create_online_log_dest_1, value: '/u01/app/oracle/oradata', scope: both, state: present} - - {name: recyclebin, value: 'off', scope: spfile, state: present} - - {name: pga_aggregate_target, value: '128M', scope: both, state: present} - - {name: sga_target, value: '1808M', scope: spfile, state: present} - home: db19-si-ee - oradb_facts_ignore_unreachable: true - oracle_db_name: &oracle_db_name2 DB2 - oracle_db_type: SI - is_container: true - storage_type: FS - oracle_database_type: MULTIPURPOSE - redolog_size: 50M - redolog_groups: 3 - datafile_dest: /u01/app/oracle/oradata - recoveryfile_dest: /u01/app/oracle//fra - listener_name: LISTENER - listener_port: *cdb_listener_port - # *local_listener is used in initparam as an achor - local_listener: *local_listener - archivelog: false - flashback: false - force_logging: false - state: present - tablespaces: - - name: TEST - size: 10M - autoextend: true - next: 50M - maxsize: 4G - content: permanent - state: present - init_parameters: - - {name: db_create_file_dest, value: '/u01/app/oracle/oradata', scope: both, state: present} - - {name: db_create_online_log_dest_1, value: '/u01/app/oracle/oradata', scope: both, state: present} - - {name: recyclebin, value: 'off', scope: spfile, state: present} - - {name: pga_aggregate_target, value: '128M', scope: both, state: present} - - {name: sga_target, value: '1808M', scope: spfile, state: present} - -oracle_pdbs: - - cdb: DB1 - home: db19-si-ee - pdb_name: ORCLPDB - pdbadmin_user: PDBROOT - listener_port: 1521 - state: present - datafile_dest: /u01/app/oracle/oradata - statspack: - purgedays: 14 - snaplevel: 7 - tablespace: PERFSTAT - state: present - tablespaces: - - name: PERFSTAT - size: 10M - autoextend: true - next: 50M - maxsize: 4G - content: permanent - state: present - - cdb: DB2 - home: db19-si-ee - pdb_name: ORCLPDB1 - listener_port: 1521 - state: present - datafile_dest: /u01/app/oracle/oradata - - cdb: DB2 - home: db19-si-ee - pdb_name: ORCLPDB2 - listener_port: 1521 - state: present - datafile_dest: /u01/app/oracle/oradata - - cdb: DB2 - home: db19-si-ee - pdb_name: ORCLPDB3 - listener_port: 1521 + listener_name: LISTENER1522 state: present - datafile_dest: /u01/app/oracle/oradata _tnsnames_config_pdb_helper: - key: "{{ oracle_pdbs[0]['pdb_name'] }}" diff --git a/extensions/molecule/shared_config/inventory/host_vars/dbfs.yml b/extensions/molecule/shared_config/inventory/host_vars/dbfs.yml new file mode 100644 index 000000000..b696ecfa5 --- /dev/null +++ b/extensions/molecule/shared_config/inventory/host_vars/dbfs.yml @@ -0,0 +1,113 @@ +--- +oracle_databases: + - home: db19-si-ee + oradb_facts_ignore_unreachable: true + oracle_db_name: &oracle_db_name DB1 + oracle_db_type: SI + is_container: true + storage_type: FS + oracle_database_type: MULTIPURPOSE + redolog_size: 50M + redolog_groups: 3 + datafile_dest: /u01/app/oracle/oradata + recoveryfile_dest: /u01/app/oracle//fra + listener_name: LISTENER + listener_port: &cdb_listener_port 1521 + # *local_listener is used in initparam as an achor + local_listener: &local_listener "{{ ansible_hostname }}:1521" + archivelog: false + flashback: false + force_logging: true + state: present + statspack: + purgedays: 14 + snaplevel: 7 + tablespace: PERFSTAT + state: present + tablespaces: + - name: PERFSTAT + size: 10M + autoextend: true + next: 50M + maxsize: 4G + content: permanent + state: present + init_parameters: + - {name: db_create_file_dest, value: '/u01/app/oracle/oradata', scope: both, state: present} + - {name: db_create_online_log_dest_1, value: '/u01/app/oracle/oradata', scope: both, state: present} + - {name: recyclebin, value: 'off', scope: spfile, state: present} + - {name: pga_aggregate_target, value: '128M', scope: both, state: present} + - {name: sga_target, value: '1808M', scope: spfile, state: present} + - home: db19-si-ee + oradb_facts_ignore_unreachable: true + oracle_db_name: &oracle_db_name2 DB2 + oracle_db_type: SI + is_container: true + storage_type: FS + oracle_database_type: MULTIPURPOSE + redolog_size: 50M + redolog_groups: 3 + datafile_dest: /u01/app/oracle/oradata + recoveryfile_dest: /u01/app/oracle//fra + listener_name: LISTENER1522 + listener_port: *cdb_listener_port + # *local_listener is used in initparam as an achor + local_listener: *local_listener + archivelog: false + flashback: false + force_logging: false + state: present + tablespaces: + - name: TEST + size: 10M + autoextend: true + next: 50M + maxsize: 4G + content: permanent + state: present + init_parameters: + - {name: db_create_file_dest, value: '/u01/app/oracle/oradata', scope: both, state: present} + - {name: db_create_online_log_dest_1, value: '/u01/app/oracle/oradata', scope: both, state: present} + - {name: recyclebin, value: 'off', scope: spfile, state: present} + - {name: pga_aggregate_target, value: '128M', scope: both, state: present} + - {name: sga_target, value: '1808M', scope: spfile, state: present} + +oracle_pdbs: + - cdb: DB1 + home: db19-si-ee + pdb_name: ORCLPDB + pdbadmin_user: PDBROOT + listener_port: 1521 + state: present + datafile_dest: /u01/app/oracle/oradata + statspack: + purgedays: 14 + snaplevel: 7 + tablespace: PERFSTAT + state: present + tablespaces: + - name: PERFSTAT + size: 10M + autoextend: true + next: 50M + maxsize: 4G + content: permanent + state: present + - cdb: DB2 + home: db19-si-ee + pdb_name: ORCLPDB1 + listener_port: 1521 + state: present + datafile_dest: /u01/app/oracle/oradata + - cdb: DB2 + home: db19-si-ee + pdb_name: ORCLPDB2 + listener_port: 1521 + state: present + datafile_dest: /u01/app/oracle/oradata + - cdb: DB2 + home: db19-si-ee + pdb_name: ORCLPDB3 + listener_port: 1521 + state: present + datafile_dest: /u01/app/oracle/oradata