From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 8 Feb 2017 11:15:10 +0000 (+0000)
Subject: Merge "Composable service support for Cinder Dell EMC Storage Center"
X-Git-Tag: opnfv-6.0.0~1111
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a79b3ecb39c85bf76b7c614bd1f1698caf74e6bc;p=apex-tripleo-heat-templates.git

Merge "Composable service support for Cinder Dell EMC Storage Center"
---

a79b3ecb39c85bf76b7c614bd1f1698caf74e6bc
diff --cc puppet/controller-role.yaml
index 854e51e1,007023cd..d3268ee2
--- a/puppet/controller-role.yaml
+++ b/puppet/controller-role.yaml
@@@ -458,8 -458,8 +458,7 @@@ resources
            - all_nodes # provided by allNodesConfig
            - vip_data # provided by allNodesConfig
            - '"%{::osfamily}"'
-           - cinder_dellsc_data # Optionally provided by ControllerExtraConfigPre
            - cinder_netapp_data # Optionally provided by ControllerExtraConfigPre
 -          - cinder_eqlx_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