Minor refactoring of vanilla create cluster
Minor refactoring of vanilla create cluster

Change-Id: Ice01a53bfc623a5d50497e6365b04a74e7ecd427

esikachev/sahara-backup,mapr/sahara,mapr/sahara,bigfootproject/sahara,redhat-openstack/sahara,keedio/sahara,xme1226/sahara,zhangjunli177/sahara,zhangjunli177/sahara,esikachev/scenario,ekasitk/sahara,matips/iosr-2015,openstack/sahara,matips/iosr-2015,zhujzhuo/Sahara,xme1226/sahara,keedio/sahara,henaras/sahara,tellesnobrega/storm_plugin,bigfootproject/sahara,citrix-openstack-build/sahara,zhujzhuo/Sahara,zhangjunli177/sahara,bigfootproject/sahara,crobby/sahara,citrix-openstack-build/sahara,henaras/sahara,tellesnobrega/storm_plugin,egafford/sahara,mapr/sahara,keedio/sahara,egafford/sahara,crobby/sahara,tellesnobrega/sahara,zhujzhuo/Sahara,ekasitk/sahara,esikachev/sahara-backup,crobby/sahara,esikachev/sahara-backup,xme1226/sahara,citrix-openstack-build/sahara,matips/iosr-2015,henaras/sahara,tellesnobrega/storm_plugin,esikachev/scenario,esikachev/scenario,openstack/sahara,tellesnobrega/sahara,redhat-openstack/sahara,redhat-openstack/sahara,ekasitk/sahara