disciplinarian

n. Enforcer of or believer in firm discipline.

a. Pertaining to discipline.