zuul
/
zuul
Code Issues Proposed changes

Merge "Ansible launcher: remove deprecated hyphens"

This commit is contained in:
Jenkins 2016-06-09 23:06:45 +00:00 committed by Gerrit Code Review
parent 74a71928a2 4829398637
commit b114e6741d
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zuul/launcher/ansiblelaunchserver.py
View File

@ -127,12 +127,7 @@ class LaunchServer(object):
self.accept_nodes = config.getboolean('launcher',
'accept_nodes')
else:
# TODO(jeblair): remove deprecated form of option
if config.has_option('launcher', 'accept-nodes'):
self.accept_nodes = config.getboolean('launcher',
'accept-nodes')
else:
self.accept_nodes = True
self.accept_nodes = True
if self.config.has_option('zuul', 'state_dir'):
state_dir = os.path.expanduser(
@ -251,8 +246,6 @@ class LaunchServer(object):
new_functions = set()
if self.accept_nodes:
new_functions.add("node_assign:zuul")
# TODO(jeblair): remove deprecated form
new_functions.add("node-assign:zuul")
new_functions.add("stop:%s" % self.hostname)
new_functions.add("set_description:%s" % self.hostname)
@ -383,10 +376,6 @@ class LaunchServer(object):
if job.name.startswith('node_assign:'):
self.log.debug("Got node_assign job: %s" % job.unique)
self.assignNode(job)
elif job.name.startswith('node-assign:'):
# TODO(jeblair): remove deprecated form
self.log.debug("Got node-assign job: %s" % job.unique)
self.assignNode(job)
elif job.name.startswith('stop:'):
self.log.debug("Got stop job: %s" % job.unique)
self.stopJob(job)