Merge "Configure DPDK options to isolate PMD cores and ovs process cores"

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

diff --git a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml
index bf06d25..0f4806d 100644 (file)
--- a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml
+++ b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: ocata
 
 description: Configure hieradata for Neutron Big Switch configuration
 
@@ -44,7 +44,6 @@ resources:
           datafiles:
             neutron_bigswitch_data:
               mapped_data:
-                neutron_enable_bigswitch_ml2: true
                 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}
@@ -56,6 +55,7 @@ resources:
   NeutronBigswitchDeployment:
     type: OS::Heat::StructuredDeployment
     properties:
+      name: NeutronBigswitchDeployment
       config: {get_resource: NeutronBigswitchConfig}
       server: {get_param: server}
       input_values: