I agree that your issue was because you were using an older version of devstack. That's explains why the dhcp agent was starting with one config file instead of two.
This page seems up to date to me: http://wiki.openstack.org/QuantumDevstack (and shows localrc) . I agree it can definitely be challenging getting everything working together when you are running on master :)
Aaron
↧