Remove duplicated name services

Due to the fact that keystone will not allow services with
duplicated names, cinder and nova services names were
changed

Closes-Bug: #1259425
Change-Id: I988aef477b418a289426e02e5e108aa57dd1076b
gitignore: add .localrc.auto and local.conf

The changeset of 893e66360caf3bcf0578d4541b3c17d089c33b02,
Change-Id of I367cadc86116621e9574ac203aafdab483d810d3
introduced local.conf and generates .localrc.auto.
But they aren't in .gitignore. This patch adds them into .gitignore.

Change-Id: I7d4dc99d980d9c5b5156cf915646bc96163a3dc4
Closes-Bug: #1267027
Setup Keystone catalog information for Ceilometer

Change-Id: I3f536f38fe7862ee41b06d1d48b848cc07492c8d
Closes-Bug: #1267322
Fix Heat/Cloud formation catalog template

Cloud formation and Heat API ports where mixed.

Change-Id: I029592c4821bb93c8a1dd91519f30908efd56627
Closes-Bug: #1267355
Enable server-side and client-side logs for libvirt

Need this to diagnose libvirt Errors in the gate

Change-Id: Id46137a71d17abc8bfab66b14ab567d81a31f018
Related-Bug: #1254872
Add Marconi to Tempest config

This patch adds queuing to tempest config, provided queuing is
available in devstack.

Change-Id: I2925a07d312c1f8ab2fe465f74f0bef9299eef40
Implements: blueprint add-basic-marconi-tests
Merge "Setup Keystone catalog information for Ceilometer"
Merge "Fix Heat/Cloud formation catalog template"
Merge "Enable server-side and client-side logs for libvirt"
Merge "gitignore: add .localrc.auto and local.conf"
Merge "Remove duplicated name services"
Merge "Add Marconi to Tempest config"
Merge branch 'master' of git://github.com/openstack-dev/devstack into opendaylight