Fix devstack template

It works 100% of the time now on Ubuntu and CentOS.  CentOS will take
~20 mintues to finish, during which SSH will not be responsive.

I will work with the images team and try to get lines 120-131 out of the template.