Ensure we indicate we are the controller in setuprc when we are the controller
Merge branch 'master' of github.com:StackGeek/openstackgeek