oracle_opatch: optionally stop processes when remove a patch

oracle_datapatch

@@ -120,6 +120,9 @@ def check_db_exists(module, msg, oracle_home, db_name, sid, db_unique_name ):
                 return False
         elif 'Database name: %s' % (db_name) in stdout: #<-- Database already exist
             return True
+        else:
+            msg = '%s' % (stdout) # this assignment does nothing as msg is not global --> should be fixed later
+            return True
     else:
         existingdbs = []
         oratabfile = '/etc/oratab'

oracle_db

@@ -282,6 +282,8 @@ oracle_db:
 '''
 import os, re, time
 
+msg = ['']
+
 try:
 	import cx_Oracle
 except ImportError:
@@ -301,7 +303,8 @@ def get_version(module, msg, oracle_home):
 
 
 # Check if the database exists
-def check_db_exists(module, msg, oracle_home, db_name, sid, db_unique_name ):
+def check_db_exists(module, oracle_home, db_name, sid, db_unique_name ):
+	global msg
 
 	if sid is None:
 		sid = ''
@@ -391,8 +394,14 @@ def create_db (module, msg, oracle_home, sys_password, system_password, dbsnmp_p
 		if system_password is not None:
 			command += ' -systemPassword \"%s\"' % (system_password)
 		else:
-			system_password = sys_password
-			command += ' -systemPassword \"%s\"' % (system_password)
+			pw_found = False
+			with open(responsefile) as rspfile:
+				for line in rspfile:
+					if re.match('systemPassword=.+', line):
+						pw_found = True
+						break
+			if not pw_found:
+				command += ' -systemPassword \"%s\"' % (sys_password)
 		if dbsnmp_password is not None:
 			command += ' -dbsnmpPassword \"%s\"' % (dbsnmp_password)
 		else:
@@ -897,8 +906,8 @@ def getconn(module,msg):
 
 def main():
 
-	msg = ['']
 	cursor = None
+	global msg
 	global gimanaged
 	global major_version
 	global user
@@ -1044,7 +1053,7 @@ def main():
 
 	if state == 'started':
 		msg = "oracle_home: %s db_name: %s sid: %s db_unique_name: %s" % (oracle_home, db_name, sid, db_unique_name)
-		if not check_db_exists(module, msg, oracle_home,db_name, sid, db_unique_name):
+		if not check_db_exists(module, oracle_home,db_name, sid, db_unique_name):
 			msg = "Database not found. %s" % msg
 			module.fail_json(msg=msg, changed=False)
 		else:
@@ -1062,7 +1071,7 @@ def main():
 
 
 	elif state == 'present':
-		if not check_db_exists(module, msg, oracle_home,db_name, sid, db_unique_name):
+		if not check_db_exists(module, oracle_home,db_name, sid, db_unique_name):
 			if create_db(module, msg, oracle_home, sys_password, system_password, dbsnmp_password, db_name, sid, db_unique_name, responsefile, template, cdb, local_undo, datafile_dest, recoveryfile_dest,
 						storage_type, dbconfig_type, racone_service, characterset, memory_percentage, memory_totalmb, nodelist, db_type, amm, initparams, customscripts,datapatch, domain):
 				newdb = True
@@ -1075,7 +1084,7 @@ def main():
 			# module.exit_json(msg=msg, changed=False)
 
 	elif state == 'absent':
-		if check_db_exists(module, msg, oracle_home, db_name, sid, db_unique_name):
+		if check_db_exists(module, oracle_home, db_name, sid, db_unique_name):
 			if remove_db(module, msg, oracle_home, db_name, sid, db_unique_name, sys_password):
 				msg = 'Successfully removed database %s' % (db_name)
 				module.exit_json(msg=msg, changed=True)

oracle_opatch

@@ -37,6 +37,15 @@ options:
         required: False
         default: None
         aliases: ['version_added']
+    exclude_upi:
+        description:
+            - The unique patch identifier that should not be rolled back
+              e.g 22990084
+            - This option will be honored only when state=absent.
+            - It helps to write idempotent playbooks when changing interim patches that are dependent on a specific PSU/RU.
+        required: False
+        default: None
+        aliases: ['exclude_unique_patch_id']
     opatch_minversion:
         description:
             - The minimum version of opatch needed
@@ -93,14 +102,14 @@ options:
 
 notes:
     -
-requirements: [ "os","pwd","distutils.version" ]
-author: Mikael Sandström, [email protected], @oravirt
+requirements: [ "os","pwd","re","distutils.version" ]
+author: Mikael Sandström, [email protected], @oravirt
 '''
 
 EXAMPLES = '''
 
 '''
-import os, pwd
+import os, pwd, re
 from distutils.version import LooseVersion
 #
 # try:
@@ -155,7 +164,7 @@ def get_file_owner(module, msg, oracle_home):
         msg = 'Could not determine owner of %s ' % (checkfile)
         module.fail_json(msg=msg)
 
-def check_patch_applied(module, msg, oracle_home, patch_id, patch_version, opatchauto):
+def check_patch_applied(module, msg, oracle_home, patch_id, patch_version, opatchauto, exclude_upi):
     '''
     Gets all patches already applied and compares to the
     intended patch
@@ -169,18 +178,28 @@ def check_patch_applied(module, msg, oracle_home, patch_id, patch_version, opatc
     (rc, stdout, stderr) = module.run_command(command)
     #module.exit_json(msg=stdout, changed=False)
     if rc != 0:
-      msg = 'Error - STDOUT: %s, STDERR: %s, COMMAND: %s' % (stdout, stderr, command)
-      module.fail_json(msg=msg, changed=False)
+        msg = 'Error - STDOUT: %s, STDERR: %s, COMMAND: %s' % (stdout, stderr, command)
+        module.fail_json(msg=msg, changed=False)
     else:
         if opatchauto:
             chk = '%s' % (patch_version)
         elif not opatchauto and patch_id is not None and patch_version is not None:
-            chk = '%s (%s)' % (patch_version,patch_id)
+            chk = r'%s \(%s\)' % (patch_version,patch_id)
         else:
-            chk = '%s' % (patch_id)
+            chk = '^%s;' % (patch_id)
 
-        if chk in stdout:
-            return True
+        if re.search(chk, stdout, re.MULTILINE):
+            if exclude_upi is None:
+                return True
+            else:
+                command += ' -id %s' % patch_id
+                (rc, stdout, stderr) = module.run_command(command)
+                if rc != 0:
+                    msg = 'Error - STDOUT: %s, STDERR: %s, COMMAND: %s' % (stdout, stderr, command)
+                    module.fail_json(msg=msg, changed=False)
+                else:
+                    chk = 'unique_patch_id:%s' % exclude_upi
+                    return (chk not in stdout)
         else:
             return False
 
@@ -296,7 +315,7 @@ def stop_process(module, oracle_home):
                elif len(line.split(':')) >= 2 and line.split(':')[1] == oracle_home:
 
                    # Find listener for ORACLE_HOME
-                   p = subprocess.Popen('ps -o cmd -C tnslsnr | grep "^%s/bin/tnslsnr "' % (line) , shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                   p = subprocess.Popen('ps -o cmd -C tnslsnr | grep "^%s/bin/tnslsnr "' % (line.split(':')[1]) , shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                    output, error = p.communicate()
                    p_status = p.wait()
 
@@ -341,7 +360,7 @@ def stop_process(module, oracle_home):
                    if msg:
                        module.fail_json(msg=msg, changed=False)
 
-def remove_patch (module, msg, oracle_home, patch_base, patch_id, opatchauto, ocm_response_file,output):
+def remove_patch (module, msg, oracle_home, patch_base, patch_id, opatchauto, ocm_response_file, stop_processes, output):
     '''
     Removes the patch
     '''
@@ -354,6 +373,9 @@ def remove_patch (module, msg, oracle_home, patch_base, patch_id, opatchauto, oc
 
         command = '%s/OPatch/%s %s -oh %s ' % (oracle_home,opatch_cmd, patch_base, oracle_home)
     else:
+        if stop_processes:
+            stop_process(module, oracle_home)
+
         opatch_cmd = 'opatch rollback'
         command = '%s/OPatch/%s -id %s -silent' % (oracle_home,opatch_cmd, patch_id)
 
@@ -447,6 +469,7 @@ def main():
             patch_base          = dict(default=None, aliases = ['path','source','patch_source','phBaseDir']),
             patch_id            = dict(default=None, aliases = ['id']),
             patch_version       = dict(required=None, aliases = ['version']),
+            exclude_upi         = dict(required=None, aliases = ['exclude_unique_patch_id']),
             opatch_minversion   = dict(default=None, aliases = ['opmv']),
             opatchauto          = dict(default='False', type='bool',aliases = ['autopatch']),
             rolling             = dict(default='True', type='bool',aliases = ['rolling']),
@@ -458,7 +481,7 @@ def main():
             output              = dict(default="short", choices = ["short","verbose"]),
             state               = dict(default="present", choices = ["present", "absent", "opatchversion"]),
             hostname            = dict(required=False, default = 'localhost', aliases = ['host']),
-            port                = dict(required=False, default = 1521),
+            port                = dict(required=False, type='int', default = 1521),
 
 
 
@@ -470,6 +493,7 @@ def main():
     patch_base          = module.params["patch_base"]
     patch_id            = module.params["patch_id"]
     patch_version       = module.params["patch_version"]
+    exclude_upi         = module.params["exclude_upi"]
     opatch_minversion   = module.params["opatch_minversion"]
     opatchauto          = module.params["opatchauto"]
     rolling             = module.params["rolling"]
@@ -512,8 +536,12 @@ def main():
 
 
     # Get the Oracle % Opatch version
-    major_version = get_version(module,msg,oracle_home)
     opatch_version = get_opatch_version(module,msg,oracle_home)
+
+    if state == 'opatchversion':
+        module.exit_json(msg=opatch_version,changed=False)
+
+    major_version = get_version(module,msg,oracle_home)
     opatch_version_noocm = '12.2.0.1.5'
 
     if opatch_minversion is not None:
@@ -526,11 +554,8 @@ def main():
         msg='An OCM response file is needed when the opatch version is < %s. Current opatch version: %s' % (opatch_version_noocm,opatch_version)
         module.fail_json(msg=msg,changed=False)
 
-    if state == 'opatchversion':
-        module.exit_json(msg=opatch_version,changed=False)
-
     if state == 'present':
-        if not check_patch_applied(module, msg, oracle_home, patch_id, patch_version, opatchauto):
+        if not check_patch_applied(module, msg, oracle_home, patch_id, patch_version, opatchauto, None):
             if apply_patch(module, msg, oracle_home, patch_base, patch_id,patch_version, opatchauto,ocm_response_file,offline,stop_processes,rolling,output):
                 if patch_version is not None:
                     msg = 'Patch %s (%s) successfully applied to %s' % (patch_id,patch_version, oracle_home)
@@ -546,8 +571,8 @@ def main():
             module.exit_json(msg=msg, changed=False)
 
     elif state == 'absent':
-        if check_patch_applied(module, msg, oracle_home, patch_id, patch_version, opatchauto):
-            if remove_patch(module, msg, oracle_home, patch_base, patch_id, opatchauto,ocm_response_file, output):
+        if check_patch_applied(module, msg, oracle_home, patch_id, patch_version, opatchauto, exclude_upi):
+            if remove_patch(module, msg, oracle_home, patch_base, patch_id, opatchauto,ocm_response_file, stop_processes, output):
                 if patch_version is not None:
                     msg = 'Patch %s (%s) successfully removed from %s' % (patch_id,patch_version, oracle_home)
                 else:
@@ -557,8 +582,9 @@ def main():
                 module.fail_json(msg=msg, changed=False)
         else:
             if patch_version is not None:
-                msg = 'Patch %s (%s) is not applied to %s' % (patch_id,patch_version, oracle_home)
-
+                msg = 'Patch %s (%s) is not applied to %s' % (patch_id, patch_version, oracle_home)
+            elif exclude_upi is not None:
+                msg = 'Patch %s (UPI %s) has already been applied and will not be removed from %s' % (patch_id, exclude_upi, oracle_home)
             else:
                 msg = 'Patch %s is not applied to %s' % (patch_id, oracle_home)
 

oracle_parameter

@@ -80,9 +80,11 @@ else:
     cx_oracle_exists = True
 
 
-# Check if the parameter exists
-def check_parameter_exists(module, mode, msg, cursor, name):
+msg = ['']
 
+# Check if the parameter exists
+def check_parameter_exists(module, mode, cursor, name):
+    global msg
 
     if not(name):
         module.fail_json(msg='Error: Missing parameter name', changed=False)
@@ -115,7 +117,8 @@ def check_parameter_exists(module, mode, msg, cursor, name):
 
 
 
-def modify_parameter(module, mode, msg, cursor, name, value, comment, scope, sid):
+def modify_parameter(module, mode, cursor, name, value, comment, scope, sid):
+    global msg
 
     contains = re.compile(r'[?*$%#()!\s,._/=+-]')
     starters = ('+','_','"','"_','/')
@@ -126,7 +129,7 @@ def modify_parameter(module, mode, msg, cursor, name, value, comment, scope, sid
 
 
 
-    currval = get_curr_value(module, mode, msg, cursor, name, scope)
+    currval = get_curr_value(module, mode, cursor, name, scope)
 
     if currval == value.lower() or not currval and value == "''":
         module.exit_json(msg='The parameter (%s) is already set to %s' % (name, value), changed=False)
@@ -179,7 +182,8 @@ def clean_string(item):
 
     return item
 
-def reset_parameter(module, mode, msg, cursor, name, value, comment, scope, sid):
+def reset_parameter(module, mode, cursor, name, value, comment, scope, sid):
+    global msg
 
     starters = ('+','_','"','"_')
     if not(name):
@@ -212,20 +216,21 @@ def reset_parameter(module, mode, msg, cursor, name, value, comment, scope, sid)
     return True
 
 
-def get_curr_value(module, mode, msg, cursor, name, scope):
+def get_curr_value(module, mode, cursor, name, scope):
+    global msg
 
     name = clean_string(name)
 
-    if scope == 'spfile':
-        parameter_source = 'v$spparameter'
-    else:
+    if scope == 'memory':
         parameter_source = 'v$parameter'
+    else:
+        parameter_source = 'v$spparameter'
 
     if mode == 'sysdba':
-        if scope == 'spfile':
-            sql = 'select lower(KSPSPFFTCTXSPDVALUE) from x$kspspfile where lower(KSPSPFFTCTXSPNAME) = lower(\'%s\')' % (name)
-        else:
+        if scope == 'memory':
             sql = 'select lower(y.ksppstdvl) from sys.x$ksppi x, sys.x$ksppcv y where x.indx = y.indx and x.ksppinm = lower(\'%s\')' % (name)
+        else:
+            sql = 'select lower(KSPSPFFTCTXSPDVALUE) from x$kspspfile where lower(KSPSPFFTCTXSPNAME) = lower(\'%s\')' % (name)
     else:
         sql = 'select lower(display_value) from %s where name = lower(\'%s\')' % (parameter_source, name)
 
@@ -242,8 +247,8 @@ def get_curr_value(module, mode, msg, cursor, name, scope):
 
 
 def main():
+    global msg
 
-    msg = ['']
     module = AnsibleModule(
         argument_spec = dict(
             hostname      = dict(default='localhost'),
@@ -312,17 +317,17 @@ def main():
     cursor = conn.cursor()
 
     if state == 'present':
-        if check_parameter_exists(module, mode, msg, cursor, name):
-            if modify_parameter(module, mode, msg, cursor, name, value, comment, scope, sid):
+        if check_parameter_exists(module, mode, cursor, name):
+            if modify_parameter(module, mode, cursor, name, value, comment, scope, sid):
                 module.exit_json(msg=msg, changed=True)
             else:
                 module.fail_json(msg=msg, changed=False)
         else:
             module.fail_json(msg=msg, changed=False)
 
     elif state == 'reset' or state == 'absent':
-        if check_parameter_exists(module, mode, msg, cursor, name):
-            if reset_parameter(module, mode, msg, cursor, name, value, comment, scope, sid):
+        if check_parameter_exists(module, mode, cursor, name):
+            if reset_parameter(module, mode, cursor, name, value, comment, scope, sid):
                 module.exit_json(msg=msg, changed=True)
             else:
                 module.fail_json(msg=msg, changed=False)