Minor cleanups
Minor cleanups

Avoid some errors that are not fatal, and re-use a variable.

toabctl/openstack-quickstart,SUSE-Cloud/openstack-quickstart,sjamgade/openstack-quickstart,vuntz/openstack-quickstart,wenhuizhang/openstack-quickstart,hayderimran7/openstack-quickstart,sayalilunkad/openstack-quickstart