Merge "puppet: tidy up the compute nova neutron config"

diff --cc puppet/compute-puppet.yaml
Simple merge

diff --cc puppet/manifests/overcloud_compute.pp
index 0c870c3,150e985..8468cd3
--- 1/puppet/manifests/overcloud_compute.pp
--- 2/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@@ -45,25 -45,8 +45,20 @@@ nova_config 
    'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
  }
  
 +$nova_enable_rbd_backend = hiera('nova_enable_rbd_backend', false)
 +if $nova_enable_rbd_backend {
 +  include ::ceph::profile::client
 +  include ::nova::compute::rbd
 +  ceph::key { 'client.openstack' :
 +    secret  => hiera('ceph::profile::params::mon_key'),
 +    cap_mon => hiera('ceph_openstack_default_cap_mon'),
 +    cap_osd => hiera('ceph_openstack_default_cap_osd'),
 +    user    => 'nova',
 +  }
 +}
 +
  include ::nova::compute::libvirt
- 
- class { 'nova::network::neutron':
-   neutron_admin_auth_url => join(['http://', hiera('neutron_host'), ':35357/v2.0']),
-   neutron_url            => join(['http://', hiera('neutron_host'), ':9696']),
- }
- 
+ include ::nova::network::neutron
  include ::neutron
  
  class { 'neutron::plugins::ml2':