Clean up local variable usage - Ironic

Change-Id: I7a455299c6aa079de02b75d4d53df43074880ff7
Merge "Clean up local variable usage - Ironic"