From 614f59ff2c1708fddbd9f2a7543abd1f2f19ce96 Mon Sep 17 00:00:00 2001
From: Vasu Kulkarni <vasu@redhat.com>
Date: Tue, 21 Jun 2016 14:10:01 -0700
Subject: [PATCH] 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>
---
 teuthology/suite/placeholder.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/teuthology/suite/placeholder.py b/teuthology/suite/placeholder.py
index 8f2a07262..0596eb972 100644
--- 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'
-- 
2.47.3