Hi Mike,
I haven't seen a plant as old as that,with those yellow flowers, so I am a bit stretched to make a positive ID. It certainly would seem to me that canelensis is a strong possibility, though the body shape here is much more cylindrical than I'd expect to see. But that might just be the age of the plant.
Do you have a closer view of the spines and flower to check?
_________________
Chris43, moderator