Dallas Mayor: No Iraq war parade, fold into Veterans Day parade