Fix references to nova-volume

Also fixes an incorrect reference to iscsi_ip_address

Change-Id: Ib4a5ffece050f1e83573802bcd465d3b5a91b197