aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller_pacemaker.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-21 13:22:35 +0000
committerGerrit Code Review <review@openstack.org>2016-06-21 13:22:35 +0000
commita7e30686903d0fa9430435c527b9fd4de1d0bb19 (patch)
treec4d29c1b9cf6afdc7d56203b1201904dbaa77956 /puppet/manifests/overcloud_controller_pacemaker.pp
parenta5399e2310e666ba5489aeccd56e810108e79d96 (diff)
parentca11c3d1c1e3837410cef8365239e338a6f5879c (diff)
Merge "Remove ::nova::network::neutron, now in puppet-tripleo"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp1
1 files changed, 0 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 93715ba..ff06569 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -353,7 +353,6 @@ MYSQL_HOST=localhost\n",
}
include ::nova::config
- include ::nova::network::neutron
if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {