Merge pull request #26 from galstrom21/master

Since jsoncli.py does not work, doing it manually
Moving openstack-ha role later into the run
Merge branch 'master' of https://github.com/rcbops/jenkins-chef-nova-dingus