X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=puppet%2Fextraconfig%2Fpre_deploy%2Fcompute%2Fneutron-ml2-bigswitch.yaml;h=e3f4cce67eb00ca0f5735788c5086ba53cbb6f4d;hb=b07b4cc1a11499c01712a50bcbc5fa1aef5bef33;hp=49c77190810592d1bf559a6fe1281f1d1730cfdc;hpb=6677663e1141c1baabb0769191a7f951abe0c66d;p=apex-tripleo-heat-templates.git

diff --git a/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml b/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml
index 49c77190..e3f4cce6 100644
--- a/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml
+++ b/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: ocata
 
 description: Configure hieradata for Big Switch agents on compute node
 
@@ -20,14 +20,22 @@ resources:
   NeutronBigswitchConfig:
     type: OS::Heat::StructuredConfig
     properties:
-      group: os-apply-config
+      group: hiera
       config:
-        hiera:
-          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}
+        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>'
+
 
   NeutronBigswitchDeployment:
     type: OS::Heat::StructuredDeployment