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 "Nova Neutron configuration now uses keystone v3 endpoint"
[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
4b0f98e
..
0f1318c
100644
(file)
--- a/
puppet/manifests/overcloud_compute.pp
+++ b/
puppet/manifests/overcloud_compute.pp
@@
-16,7
+16,9
@@
include ::tripleo::packages
include ::tripleo::firewall
include ::tripleo::packages
include ::tripleo::firewall
+create_resources(kmod::load, hiera('kernel_modules'), {})
create_resources(sysctl::value, hiera('sysctl_settings'), {})
create_resources(sysctl::value, hiera('sysctl_settings'), {})
+Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
if count(hiera('ntp::servers')) > 0 {
include ::ntp
if count(hiera('ntp::servers')) > 0 {
include ::ntp
@@
-129,6
+131,10
@@
else {
n1kv_version => hiera('n1kv_vem_version', undef),
}
}
n1kv_version => hiera('n1kv_vem_version', undef),
}
}
+
+ if 'bsn_ml2' in hiera('neutron::plugins::ml2::mechanism_drivers') {
+ include ::neutron::agents::bigswitch
+ }
}
}