aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller-puppet.yaml
diff options
context:
space:
mode:
authorRobert Pothier <rpothier@cisco.com>2015-09-09 11:08:37 -0400
committerRob Pothier <rpothier@cisco.com>2015-09-15 20:37:56 +0000
commit773324a6d05f1fb8877adf95a47e7a3d1619d099 (patch)
tree37b768b2cf8d32c5b2dd034b3bf86c45aa1a704a /puppet/controller-puppet.yaml
parent55d7c4ff33956b2493452f81f8f2cbcf8bcf6529 (diff)
Enable Cisco Nexus and UCSM plugins
This enables support for the Cisco UCS Manager and Cisco Nexus plugins Change-Id: I1bc28a4768d5d6857a0504ca1f77dd71259570b8
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 291dc6e3..30090ff3 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -876,6 +876,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}