aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller-role.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-21 06:41:16 +0000
committerGerrit Code Review <review@openstack.org>2017-04-21 06:41:17 +0000
commit3fe155473f488900a61328168fb41426cf6c1f78 (patch)
tree6218f07a8ccf14321d6bed120561b9b83814a209 /puppet/controller-role.yaml
parent42ed08b6c016e85c3b3026571200e3f81866354b (diff)
parentd10aacc299c70ea582930056c1c94d222f76dfa8 (diff)
Merge "Add composable role support for NetApp Cinder back end" into stable/ocata
Diffstat (limited to 'puppet/controller-role.yaml')
-rw-r--r--puppet/controller-role.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml
index 2f4f583c..3d32add2 100644
--- a/puppet/controller-role.yaml
+++ b/puppet/controller-role.yaml
@@ -467,7 +467,6 @@ resources:
- all_nodes # provided by allNodesConfig
- vip_data # provided by allNodesConfig
- '"%{::osfamily}"'
- - 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