Was going into war with Iran a mistake?

The U.S. and Iran have reached an agreement, but does this mean the war is over?