From: Vasu Kulkarni <vasu@redhat.com>
Date: Tue, 21 Jun 2016 21:10:01 +0000 (-0700)
Subject: Fix ceph-deploy 'branch' override
X-Git-Tag: 1.1.0~596^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F849%2Fhead;p=teuthology.git

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 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'