Fix ceph-deploy 'branch' override

Default ceph-deploy override template defines devcommit which makes
'branch' overrides in the qa-suite useless since it only picksup one option
Remove the devcommit overrides from the template and use that as
default in case no other 'branch' override exist.

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>

diff --git a/teuthology/suite/placeholder.py b/teuthology/suite/placeholder.py
index 8f2a07262dca4bb89b652dc140c323c1b7e774a2..0596eb97246fa72b86614bb7428592daac07b83a 100644 (file)
--- a/teuthology/suite/placeholder.py
+++ b/teuthology/suite/placeholder.py
@@ -73,9 +73,6 @@ dict_templ = {
             'sha1': Placeholder('ceph_hash'),
         },
         'ceph-deploy': {
-            'branch': {
-                'dev-commit': Placeholder('ceph_hash'),
-            },
             'conf': {
                 'client': {
                     'log file': '/var/log/ceph/ceph-$name.$pid.log'