Merge pull request #309 from mancdaz/sprint

don't run nova-network-controller on ha-controller2
Auto Updating mysql-openstack submodule
Auto Updating haproxy submodule
Auto Updating openstack-ha submodule