Clean up of openstack-setup role

whitespace, logic simplifications
Merge pull request #601 from blueboxgroup/cleanup-openstack-setup

Clean up of openstack-setup role