From 788bafd901d2a86114711d0133768935a696715b Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 12 Mar 2015 17:29:07 -0400 Subject: puppet: tidy up the compute nova neutron config Updates the puppet configuration for the Nova neutron configs so that we do the join conversions in the Heat templates and use only hiera for configuration of the ::nova::network::neutron class. This updates the compute configuration to match what we now do on the controller as well. Change-Id: I2b352551777f64e0ceb119f48cc3b3ab1779f4d5 --- puppet/manifests/overcloud_compute.pp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'puppet/manifests/overcloud_compute.pp') diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 0d2790b2..150e9858 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -46,12 +46,7 @@ nova_config { } 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': -- cgit 1.2.3-korg