Merge pull request #447 from kshtsk/add-teuthology-branch

teuthology: add branch parameter for git checkout

diff --cc roles/teuthology/defaults/main.yml
index d0694182dc93662057c290d894ad4599bcc3150e,50ff191731bb5118f9846fe061b599fd73fc850c..4b62c341b3c6ffcc18713248c16ddf7fff47c615
--- 1/roles/teuthology/defaults/main.yml
--- 2/roles/teuthology/defaults/main.yml
+++ b/roles/teuthology/defaults/main.yml
@@@ -1,16 -1,12 +1,17 @@@
  ---
 +teuthology_scheduler_user: teuthology
 +teuthology_execution_user: teuthworker
 +
  teuthology_users:
    # for scheduling tests
 -  - teuthology
 +  - "{{ teuthology_scheduler_user }}"
    # for executing tests
 -  - teuthworker
 +  - "{{ teuthology_execution_user }}"
  
  teuthology_repo: https://github.com/ceph/teuthology.git
+ teuthology_branch: "master"
  teuthology_yaml_extra: ""
  
 +archive_base: "/home/{{ teuthology_execution_user }}/archive"
 +
  remote_crontab_url: "https://raw.githubusercontent.com/ceph/ceph/master/qa/crontab/teuthology-cronjobs"

diff --cc roles/teuthology/tasks/setup_users.yml
Simple merge