Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 76b53b3 341afb9)
Merge "Composable service support for Cinder Dell EMC Storage Center"
authorJenkins <jenkins@review.openstack.org>
Wed, 8 Feb 2017 11:15:10 +0000 (11:15 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 8 Feb 2017 11:15:10 +0000 (11:15 +0000)
1  2 
capabilities-map.yaml patch | diff1 | diff2 | blob | history
puppet/controller-role.yaml patch | diff1 | diff2 | blob | history

diff --cc capabilities-map.yaml
Simple merge
diff --cc puppet/controller-role.yaml
index 854e51e,007023c..d3268ee
--- 1/puppet/controller-role.yaml
--- 2/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