Add openstack-clients dependency

Add dependency on openstack-clients element to correct
"Command not found" error. Also a little code clean up
so that it is more readable.

fixes bug 1196681
Change-Id: Id192e8c89fb48182d69171fc754b1bfeee145a3a
Authored-by: Chris Krelle <nobodycam@gmail.com>
Merge "Add openstack-clients dependency"