We're talking about all of the above. The minister will launch the consultation process in the very near future to outline all of those issues and others in terms of what a new defence policy for Canada should look like.
On March 22nd, 2016. See this statement in context.