Remove edit of controller-address

We were editing the heat template to replace the controller ip
with 192.0.2.2, this isn't needed as heat-localip changes the
metadata.

Change-Id: I92dcdd41cfdab6a94de7d8e92e8fa77927cee440
Increase size of VM disk

10G doesn't seem to be enough for the undercloud

Change-Id: I67c41b23539287eabf72ec15f70f89d7c44bab7f
Merge "Increase size of VM disk"