aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_compute.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-10-07 07:23:17 +0000
committerGerrit Code Review <review@openstack.org>2015-10-07 07:23:17 +0000
commita328c134b1776bd34b720171967af5c94014529f (patch)
tree2a9a21da2f49a91b5d119aaf42913ac88afe329f /puppet/manifests/overcloud_compute.pp
parentd29003ac6d1c61db65b4ca3272ecbde3ea0942be (diff)
parentd0b31bab825400a74b656af63b3fbb8ddad6553d (diff)
Merge "Enable Cisco N1KV driver"
Diffstat (limited to 'puppet/manifests/overcloud_compute.pp')
-rw-r--r--puppet/manifests/overcloud_compute.pp8
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index fb5a3520..80543813 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -78,6 +78,14 @@ class { 'neutron::agents::ml2::ovs':
tunnel_types => split(hiera('neutron_tunnel_types'), ','),
}
+if 'cisco_n1kv' in hiera('neutron_mechanism_drivers') {
+ class { 'neutron::agents::n1kv_vem':
+ n1kv_source => hiera('n1kv_vem_source', undef),
+ n1kv_version => hiera('n1kv_vem_version', undef),
+ }
+}
+
+
include ::ceilometer
include ::ceilometer::agent::compute
include ::ceilometer::agent::auth