X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fcontroller.yaml;h=ae1ef49ab19d16250dda05f2c6dab2513cea8b69;hb=749d24ec9d6d6c3d0198a287bd7adebca263d7b3;hp=22b773c1e81a226b467000f0d4b15d030130cba5;hpb=a2614491be1cae82e4b04337184b75644633ce3f;p=apex-tripleo-heat-templates.git diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 22b773c1..ae1ef49a 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -824,9 +824,7 @@ resources: - neutron_bigswitch_data # Optionally provided by ControllerExtraConfigPre - neutron_cisco_data # Optionally provided by ControllerExtraConfigPre - cisco_n1kv_data # Optionally provided by ControllerExtraConfigPre - - neutron_nuage_data # Optionally provided by ControllerExtraConfigPre - midonet_data #Optionally provided by AllNodesExtraConfig - - neutron_opencontrail_data # Optionally provided by ControllerExtraConfigPre merge_behavior: deeper datafiles: service_configs: