Merge branch 'dbaas_aw2_az3', remote-tracking branch 'origin/dbaas_aw2_az2' into dbaas_aw2_az3
don't need conductor on compute nodes
adding nova_dhcpbridge
moving to bond0 and change dhcpbridge
adding fixed_net_gw & fixed_bridge
adding haproxy config
adding haproxy
moved around comments
adding  haproxy.sls
Rabbit work for Saurabh
Merge branch 'dbaas_aw2_az3' of https://git.hpcloud.net/salt-openstack/openstack
Merge branch 'master' of https://git.hpcloud.net/salt-openstack/openstack

Conflicts:
	rabbitmq.sls
remove the public ubuntu mirror for packages.
adding back the option to use the public openstack mirror
adding the  /var/lib/nova/instances/_base/ephemeral

There seems to be an issue where nova on reboot gets into a muddle when
trying to check if the files for a VM still exist, and somehow it ends
up checking for a file called just âephemeralârather that âephemeral_<size>_<fstype>.
(It gets worse as it then tries to re-get the ephemeral disk from
Glance and fails because at this stage it doesnt have the users credentials).

Just creating an empty file works around the issue.
adding debuging by default for the moment
Merge branch 'master' of https://git.hpcloud.net/salt-openstack/openstack
Adding RabbitMQ Cluster setup
updated rabbitmq cluster config
addes sleept before stop/start of the service