added overrides for ceph-deploy

Signed-off-by: tamil <tamil.muthamizhan@inktank.com>
Merge branch 'master' of github.com:ceph/teuthology
ceph.conf.template: enable osd debug verify stray on activate

Signed-off-by: Samuel Just <sam.just@inktank.com>
lock: drop machine-type default, but require for lock-many

Signed-off-by: Sage Weil <sage@inktank.com>
lock: make --summary list all machines by default

Signed-off-by: Sage Weil <sage@inktank.com>
lock: filter machine type for --list, --list-targets

Signed-off-by: Sage Weil <sage@inktank.com>
Merge branch 'wip-machine-type'

Reviewed-by: Sandon Van Ness <sandon@inktank.com>
Merge remote-tracking branch 'gh/next'