Clean up nested-if logic
Clean up nested-if logic

tchaikov/teuthology,michaelsevilla/teuthology,dmick/teuthology,ktdreyer/teuthology,t-miyamae/teuthology,ceph/teuthology,caibo2014/teuthology,dmick/teuthology,tchaikov/teuthology,SUSE/teuthology,ceph/teuthology,SUSE/teuthology,ivotron/teuthology,dreamhost/teuthology,zhouyuan/teuthology,dmick/teuthology,SUSE/teuthology,michaelsevilla/teuthology,zhouyuan/teuthology,yghannam/teuthology,robbat2/teuthology,dreamhost/teuthology,yghannam/teuthology,robbat2/teuthology,ktdreyer/teuthology,t-miyamae/teuthology,ivotron/teuthology,caibo2014/teuthology