Discipline or creativity

For me, discipline is more important.
Creativity can help sometimes, but without discipline people start trying many things at the same time and end up making things difficult for themselves.

100% both, you need to find right time to be creative

poker is more about discipline than creativity, discipline is what makes you win in the long run because it helps you make good decisions, avoid mistakes, and not let emotions get the better of you, creativity matters, but it"s secondary and only serves to gain an advantage in specific situations, without discipline, creativity won"t save you from defeat.

When you are playing: creativity
When you are deciding which games to play and when: discipline

Since my avatar here is a celtic knot representing discipline I think my answer should be obvious. I may be too disciplined, playing too tight, so I frequently don't get paid off on big hands. I am not very good at tournaments, at least in relation to cash games, commonly making it to the money, but almost always short-stacked. I didn't play at all the last six years but I got the urge several days ago and I am playing lotsa free and cheap tourneys trying to learn to play looser early, with the attitude that I will either get some chips or do something else. This does not come naturally to me, but I am trying to be more creative...

The key word in poker is discipline, in hand selection, action choice, and bankroll management. I never thought about creativity; I always thought about not being predictable.