Mayor and city council at odds over water restriction ordinance