added level of indirection causes incorrect hiera config

[apex-tripleo-heat-templates.git] / puppet / extraconfig / pre_deploy / compute / neutron-ml2-bigswitch.yaml

diff --git a/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml b/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml
index 93408dd..6e010de 100644 (file)
--- a/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml
+++ b/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml
@@ -24,17 +24,16 @@ resources:
       config:
         datafiles:
           neutron_bigswitch_data:
-            mapped_data:
-              neutron::agents::bigswitch::agent_enabled: {get_input: neutron_enable_bigswitch_agent}
-              neutron::agents::bigswitch::lldp_enabled: {get_input: neutron_enable_bigswitch_lldp}
-              # NOTE(aschultz): required for the puppet module but we don't
-              # actually want them defined on the compute nodes so we're
-              # relying on the puppet  module's handling of <SERVICE DEFAULT>
-              # to just not set these but still accept that they were defined.
-              # This will should be fixed in puppet-neutron and removed here,
-              # but for backportability, we need to define something.
-              neutron::plugins::ml2::bigswitch::restproxy::servers: '<SERVICE DEFAULT>'
-              neutron::plugins::ml2::bigswitch::restproxy::server_auth: '<SERVICE DEFAULT>'
+            neutron::agents::bigswitch::agent_enabled: {get_input: neutron_enable_bigswitch_agent}
+            neutron::agents::bigswitch::lldp_enabled: {get_input: neutron_enable_bigswitch_lldp}
+            # NOTE(aschultz): required for the puppet module but we don't
+            # actually want them defined on the compute nodes so we're
+            # relying on the puppet  module's handling of <SERVICE DEFAULT>
+            # to just not set these but still accept that they were defined.
+            # This will should be fixed in puppet-neutron and removed here,
+            # but for backportability, we need to define something.
+            neutron::plugins::ml2::bigswitch::restproxy::servers: '<SERVICE DEFAULT>'
+            neutron::plugins::ml2::bigswitch::restproxy::server_auth: '<SERVICE DEFAULT>'
 
 
   NeutronBigswitchDeployment: