Long-planned waterfront units will be marketed in new showroom as consortium and city agree to Discovery Centre lease