From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 14 Jun 2016 15:50:33 +0000 (-0400)
Subject: Remove ::nova::network::neutron, now in puppet-tripleo
X-Git-Tag: opnfv-6.0.0~1932^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ca11c3d1c1e3837410cef8365239e338a6f5879c;p=apex-tripleo-heat-templates.git

Remove ::nova::network::neutron, now in puppet-tripleo

It moved to nova/api profile.

Change-Id: I6adbc0ea4db1d7d75910b41c8a43637efb6410a4
Depends-On: I6b5857d3d4740c0bf3f748719f30a05f1c62cb59
---

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 6084c954..ae2495aa 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -151,7 +151,6 @@ if hiera('step') >= 4 {
     memcached_servers => $memcached_servers
   }
   include ::nova::config
-  include ::nova::network::neutron
 
   if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
 
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 13271116..77189bd9 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -349,7 +349,6 @@ MYSQL_HOST=localhost\n",
   }
 
   include ::nova::config
-  include ::nova::network::neutron
 
   if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {