commit 48293986373d7f40f53024ccb55497786245faa5
author James E. Blair <jeblair@redhat.com> Wed Jun 08 14:28:57 2016 -0700
committer James E. Blair <jeblair@redhat.com> Thu Jun 09 14:36:26 2016 -0700
tree a3d60fbeb4ba8187d7fe3864d73bcea3965553f3
parent 7fac225244ab92e505182fe23446824b07da38c0

Ansible launcher: remove deprecated hyphens

Change-Id: I140980f2a8857bf772f1314fad9cb24e0f79506a

zuul/launcher/ansiblelaunchserver.py

diff --git a/zuul/launcher/ansiblelaunchserver.py b/zuul/launcher/ansiblelaunchserver.py
index 3510672..f644c14 100644
--- a/zuul/launcher/ansiblelaunchserver.py
+++ b/zuul/launcher/ansiblelaunchserver.py
@@ -127,12 +127,7 @@
             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 @@
         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 @@
                     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)