summaryrefslogtreecommitdiffstats
path: root/puppet/controller-puppet.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-16 09:20:43 +0000
committerGerrit Code Review <review@openstack.org>2015-09-16 09:20:43 +0000
commitf84d4e45c01cb69c4ecc8032f76f2142bfbb76e0 (patch)
tree74fa3bbd40dab583242250791c4c4177154b78aa /puppet/controller-puppet.yaml
parent8a8459fb6de4b0f4a340fcec8c438c2209569ccf (diff)
parent773324a6d05f1fb8877adf95a47e7a3d1619d099 (diff)
Merge "Enable Cisco Nexus and UCSM plugins"
Diffstat (limited to 'puppet/controller-puppet.yaml')
-rw-r--r--puppet/controller-puppet.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index f1849e3e..f47463ab 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -910,6 +910,7 @@ resources:
- '"%{::osfamily}"'
- common
- cinder_netapp_data # Optionally provided by ControllerExtraConfigPre
+ - neutron_cisco_data # Optionally provided by ControllerExtraConfigPre
datafiles:
controller_extraconfig:
mapped_data: {get_param: ControllerExtraConfig}