From 2288c1ae9cf58f5dd215de83820d7f2c98b5ca7c Mon Sep 17 00:00:00 2001
From: Thorsten Bruhns <thorsten.bruhns@googlemail.com>
Date: Sun, 10 Jul 2022 08:46:29 +0000
Subject: [PATCH] oradb_manage_statspack: Bugfix for db.state <> present

---
 roles/oradb_manage_statspack/tasks/main.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/roles/oradb_manage_statspack/tasks/main.yml b/roles/oradb_manage_statspack/tasks/main.yml
index e4a785e4c..5a02d5794 100644
--- a/roles/oradb_manage_statspack/tasks/main.yml
+++ b/roles/oradb_manage_statspack/tasks/main.yml
@@ -51,6 +51,7 @@
         - statspackcmd.rc != 0
         - '"ORA-01920:" not in statspackcmd.stdout'  # ORA-01920: user name 'PERFSTAT' conflicts with another user
       when:
+        - dbh.state | upper == 'PRESENT'
         - dbh.statspack is defined
         - dbh.statspack.state | default('present') == 'present'
 
@@ -88,6 +89,7 @@
     - "{{ oracle_databases }}"
   when:
     - oracle_databases is defined
+    - dbh.state | upper == 'PRESENT'
     - dbh.statspack is defined
     - dbh.statspack.state | default('present') == 'present'
   become_user: "{{ oracle_user }}"
@@ -119,6 +121,7 @@
     - "{{ oracle_databases }}"
   when:
     - oracle_databases is defined
+    - dbh.state | upper == 'PRESENT'
     - dbh.statspack is defined
     - dbh.statspack.state | default('present') == 'present'
   become_user: "{{ oracle_user }}"
@@ -191,6 +194,7 @@
         - '"ORA-01920:" not in statspackcmd.stdout'  # ORA-01920: user name 'PERFSTAT' conflicts with another user
       when:
         - oracle_pdbs is defined
+        - pdb.0.state | default('present') == 'present'
         - pdb.0.statspack is defined
         - pdb.0.statspack.state | default('present') == 'present'
 
@@ -233,6 +237,7 @@
     - oracle_pdbs is defined
     - pdb.0.cdb is defined
     - pdb.0.pdb_name is defined
+    - pdb.0.state | default('present') == 'present'
     - pdb.0.statspack is defined
     - pdb.0.statspack.state | default('present') == 'present'
   become_user: "{{ oracle_user }}"
@@ -265,6 +270,7 @@
     - oracle_pdbs is defined
     - pdb.0.cdb is defined
     - pdb.0.pdb_name is defined
+    - pdb.0.state | default('present') == 'present'
     - pdb.0.statspack is defined
     - pdb.0.statspack.state | default('present') == 'present'
   become: true