cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Identify existing unmanaged jobs by exact match, when no header comment is found

Browse source 
* updated `find_job` method to find by exact match of job, when no matching header comment is found
  * note this fallback injects a header comment for later calls to `update_job` or `remove_job`
* abstracted header comment building to `do_comment` method

Fixes #3256
This commit is contained in:
Evan Kaufman 2016-08-20 14:56:41 -07:00 committed by Matt Clay
parent 47ffb6d542
commit 5d3e64b0d2
1 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lib/ansible/modules/system/cron.py
View file

@ -307,9 +307,12 @@ class CronTab(object):
if rc != 0: if rc != 0:
self.module.fail_json(msg=err) self.module.fail_json(msg=err)
def do_comment(self, name):
return "%s%s" % (self.ansible, name)
def add_job(self, name, job): def add_job(self, name, job):
# Add the comment # Add the comment
self.lines.append("%s%s" % (self.ansible, name)) self.lines.append(self.do_comment(name))
# Add the job # Add the job
self.lines.append("%s" % (job)) self.lines.append("%s" % (job))
@ -370,7 +373,8 @@ class CronTab(object):
except: except:
raise CronTabError("Unexpected error:", sys.exc_info()[0]) raise CronTabError("Unexpected error:", sys.exc_info()[0])
def find_job(self, name): def find_job(self, name, job=None):
# attempt to find job by 'Ansible:' header comment
comment = None comment = None
for l in self.lines: for l in self.lines:
if comment is not None: if comment is not None:
@ -381,6 +385,19 @@ class CronTab(object):
elif re.match( r'%s' % self.ansible, l): elif re.match( r'%s' % self.ansible, l):
comment = re.sub( r'%s' % self.ansible, '', l) comment = re.sub( r'%s' % self.ansible, '', l)
# failing that, attempt to find job by exact match
if job:
for i, l in enumerate(self.lines):
if l == job:
# if no leading ansible header, insert one
if not re.match( r'%s' % self.ansible, self.lines[i-1]):
self.lines.insert(i, self.do_comment(name))
return [self.lines[i], l, True]
# if a leading blank ansible header AND job has a name, update header
elif name and self.lines[i-1] == self.do_comment(None):
self.lines[i-1] = self.do_comment(name)
return [self.lines[i-1], l, True]
return [] return []
def find_env(self, name): def find_env(self, name):
@ -431,7 +448,7 @@ class CronTab(object):
return envnames return envnames
def _update_job(self, name, job, addlinesfunction): def _update_job(self, name, job, addlinesfunction):
ansiblename = "%s%s" % (self.ansible, name) ansiblename = self.do_comment(name)
newlines = [] newlines = []
comment = None comment = None
@ -652,17 +669,22 @@ def main():
crontab.remove_env(name) crontab.remove_env(name)
changed = True changed = True
else: else:
old_job = crontab.find_job(name)
if do_install: if do_install:
job = crontab.get_cron_job(minute, hour, day, month, weekday, job, special_time, disabled) job = crontab.get_cron_job(minute, hour, day, month, weekday, job, special_time, disabled)
old_job = crontab.find_job(name, job)
if len(old_job) == 0: if len(old_job) == 0:
crontab.add_job(name, job) crontab.add_job(name, job)
changed = True changed = True
if len(old_job) > 0 and old_job[1] != job: if len(old_job) > 0 and old_job[1] != job:
crontab.update_job(name, job) crontab.update_job(name, job)
changed = True changed = True
if len(old_job) > 2:
crontab.update_job(name, job)
changed = True
else: else:
old_job = crontab.find_job(name)
if len(old_job) > 0: if len(old_job) > 0:
crontab.remove_job(name) crontab.remove_job(name)
changed = True changed = True