Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
| inline |
side by side
Merge "neutron: delete by default router/dhcp namespaces"
[apex-tripleo-heat-templates.git]
/
puppet
/
manifests
/
overcloud_compute.pp
diff --git
a/puppet/manifests/overcloud_compute.pp
b/puppet/manifests/overcloud_compute.pp
index
06efd6d
..
593cc50
100644
(file)
--- a/
puppet/manifests/overcloud_compute.pp
+++ b/
puppet/manifests/overcloud_compute.pp
@@
-79,6
+79,7
@@
if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2'
}
include ::nova::network::neutron
include ::neutron
+include ::neutron::config
# If the value of core plugin is set to 'nuage',
# include nuage agent,