added level of indirection causes incorrect hiera config

 - until Newton this worked fine, however starting with Ocata, we
   do not need the key 'mapped_data'
 - having it results in extra indirection in the dictionary in
   neutron_bigswitch_data.json

Closes-Bug: #1729453

Change-Id: I3bc9940aeff4e290d83de95a7df294c11f061954
(cherry picked from commit 485339129cee8f5d3223cf47858a5c9f79b0a8de)

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:

diff --git a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml
index 71a915d..cda598a 100644 (file)
--- a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml
+++ b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml
@@ -50,16 +50,15 @@ 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}
-              neutron::plugins::ml2::bigswitch::restproxy::servers: {get_input: restproxy_servers}
-              neutron::plugins::ml2::bigswitch::restproxy::server_auth: {get_input: restproxy_server_auth}
-              neutron::plugins::ml2::bigswitch::restproxy::auto_sync_on_failure: {get_input: restproxy_auto_sync_on_failure}
-              neutron::plugins::ml2::bigswitch::restproxy::consistency_interval: {get_input: restproxy_consistency_interval}
-              neutron::plugins::ml2::bigswitch::restproxy::neutron_id: {get_input: restproxy_neutron_id}
-              neutron::plugins::ml2::bigswitch::restproxy::server_ssl: {get_input: restproxy_server_ssl}
-              neutron::plugins::ml2::bigswitch::restproxy::ssl_cert_directory: {get_input: restproxy_ssl_cert_directory}
+            neutron::agents::bigswitch::agent_enabled: {get_input: neutron_enable_bigswitch_agent}
+            neutron::agents::bigswitch::lldp_enabled: {get_input: neutron_enable_bigswitch_lldp}
+            neutron::plugins::ml2::bigswitch::restproxy::servers: {get_input: restproxy_servers}
+            neutron::plugins::ml2::bigswitch::restproxy::server_auth: {get_input: restproxy_server_auth}
+            neutron::plugins::ml2::bigswitch::restproxy::auto_sync_on_failure: {get_input: restproxy_auto_sync_on_failure}
+            neutron::plugins::ml2::bigswitch::restproxy::consistency_interval: {get_input: restproxy_consistency_interval}
+            neutron::plugins::ml2::bigswitch::restproxy::neutron_id: {get_input: restproxy_neutron_id}
+            neutron::plugins::ml2::bigswitch::restproxy::server_ssl: {get_input: restproxy_server_ssl}
+            neutron::plugins::ml2::bigswitch::restproxy::ssl_cert_directory: {get_input: restproxy_ssl_cert_directory}
 
   NeutronBigswitchDeployment:
     type: OS::Heat::StructuredDeployment