aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
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/controller.yaml
parentd29003ac6d1c61db65b4ca3272ecbde3ea0942be (diff)
parentd0b31bab825400a74b656af63b3fbb8ddad6553d (diff)
Merge "Enable Cisco N1KV driver"
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r--puppet/controller.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 8d10482c..48f3acee 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -949,6 +949,7 @@ resources:
- cinder_netapp_data # Optionally provided by ControllerExtraConfigPre
- neutron_bigswitch_data # Optionally provided by ControllerExtraConfigPre
- neutron_cisco_data # Optionally provided by ControllerExtraConfigPre
+ - cisco_n1kv_data # Optionally provided by ControllerExtraConfigPre
datafiles:
controller_extraconfig:
mapped_data: {get_param: ControllerExtraConfig}