X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fneutron-ovs-dpdk-agent.yaml;h=5c77e35d47412d70b9a6d920cfdf8fe90e7b0bb9;hb=1ed5fbf6184fa5ffe35cee6f81128b8999458ac6;hp=1f1e14ab1f2b8f2440a4b5ca971b7f25b005937d;hpb=d67627b418f050d4afc9034c650276d58e6f9c49;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/neutron-ovs-dpdk-agent.yaml b/puppet/services/neutron-ovs-dpdk-agent.yaml
index 1f1e14ab..5c77e35d 100644
--- a/puppet/services/neutron-ovs-dpdk-agent.yaml
+++ b/puppet/services/neutron-ovs-dpdk-agent.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Neutron OVS DPDK configured with Puppet for Compute Role
@@ -19,13 +19,15 @@ parameters:
                  via parameter_defaults in the resource registry.
     type: json
   NeutronDpdkCoreList:
-    default: ""
     description: List of cores to be used for DPDK Poll Mode Driver
     type: string
+    constraints:
+      - allowed_pattern: "'[0-9,-]+'"
   NeutronDpdkMemoryChannels:
-    default: ""
     description: Number of memory channels to be used for DPDK
     type: string
+    constraints:
+      - allowed_pattern: "[0-9]+"
   NeutronDpdkSocketMemory:
     default: ""
     description: Memory allocated for each socket
@@ -63,7 +65,7 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [NeutronOvsAgent, role_data, config_settings]
-            neutron::agents::ml2::ovs::enable_dpdk: true
+          - neutron::agents::ml2::ovs::enable_dpdk: true
             neutron::agents::ml2::ovs::datapath_type: {get_param: NeutronDatapathType}
             neutron::agents::ml2::ovs::vhostuser_socket_dir: {get_param: NeutronVhostuserSocketDir}
             vswitch::dpdk::core_list: {get_param: NeutronDpdkCoreList}