install instead of upgrade
Merge pull request #225 from rackerjoe/install

Merged automatically by jenkins after successful build test
moving some things into network options, specifically dhcpbridge, so can base on provider attribute
adding nova-compute.conf logic for quantum
moving some things into network options, specifically dhcpbridge, so can base on provider attribute
moving some things into network options, specifically dhcpbridge, so can base on provider attribute
End of sprint version bump.
Merge branch 'master' of https://github.com/rcbops-cookbooks/nova into network-split