Add missing floating ip variable, and fix tenant variable name