Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 7b22f2d)
Remove ::nova::network::neutron, now in puppet-tripleo
authorEmilien Macchi <emilien@redhat.com>
Tue, 14 Jun 2016 15:50:33 +0000 (11:50 -0400)
committerEmilien Macchi <emilien@redhat.com>
Mon, 20 Jun 2016 17:49:24 +0000 (13:49 -0400)
It moved to nova/api profile.

Change-Id: I6adbc0ea4db1d7d75910b41c8a43637efb6410a4
Depends-On: I6b5857d3d4740c0bf3f748719f30a05f1c62cb59

puppet/manifests/overcloud_controller.pp patch | blob | history
puppet/manifests/overcloud_controller_pacemaker.pp patch | blob | history

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 6084c95..ae2495a 100644 (file)
--- 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 1327111..77189bd 100644 (file)
--- 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' {