From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 19 Mar 2015 11:07:35 +0000 (+0000)
Subject: Merge "puppet: tidy up the compute nova neutron config"
X-Git-Tag: opnfv-6.0.0~2644
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=558cd7d09ce0604dd744a3fd2166ce361ad90cc2;p=apex-tripleo-heat-templates.git

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

558cd7d09ce0604dd744a3fd2166ce361ad90cc2
diff --cc puppet/manifests/overcloud_compute.pp
index 0c870c35,150e9858..8468cd39
--- a/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':