Changes to scripts to work with devstack

Change-Id: If4882794c9982bfca0749893ab56e7f7438cd394