Revert changes to tempest playbook and add node_prefix back

Change-Id: I8f53e128aa3db215d5668a51752ce6b54776f40f