I found in trying to add features, I really needed a non daemon
mode to do this efficiently. It shouldn't hurt to have it in the
main program.
Change-Id: Ie8c02a7b6f834436aa5749097e3d9f6dbb33107b
Reviewed-on: https://review.openstack.org/23340
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins