Merging Linux bridge support into Mesa 1.6.1 [3/3]

This pull request bundle merges neutron Linux bridge support into Mesa 1.6.1 from pebbles.


 .../cookbooks/nova/files/default/nova-compute.conf |    6 ++++++
 chef/cookbooks/nova/recipes/compute.rb             |    6 +++---
 chef/cookbooks/nova/recipes/config.rb              |    2 ++
 .../nova/templates/default/nova-compute.conf.erb   |   21 --------------------
 .../cookbooks/nova/templates/default/nova.conf.erb |   16 +++++++++++++++
 5 files changed, 27 insertions(+), 24 deletions(-)

Crowbar-Pull-ID: 2e7e34caa12af20d403f9baa19e5050351e2b7d9

Crowbar-Release: mesa-1.6.1