Clean up of openstack-setup role

whitespace, logic simplifications