Split disk creation out of swift_configure

Change-Id: Id33939182d84eeff10ba4139eeced2c1bc532f0f