Make sure openstack tenant is defined as string (on branch develop)

As discussed with @adamstegman
PR replacing #555, which was done on the `master` branch.

Original request:

We had a tenant created by our openstack provider called "0001". It currently ends up in the yaml without quotes. When the yaml is loaded, the 0001 is interpreted to be an integer and resolves to 1. This breaks our setup.