Merge "OvsDpdkMemoryChannels parameter default value"

2018-01-16 00:29:36 +00:00 · 2018-01-16 00:29:36 +00:00 · 0d24fdbd2e
commit 0d24fdbd2e
parent bfc61c8030 2194cce7b8
3 changed files with 2 additions and 3 deletions
--- a/environments/neutron-ovs-dpdk.yaml
+++ b/environments/neutron-ovs-dpdk.yaml
@ -8,7 +8,6 @@ parameter_defaults:
  NeutronVhostuserSocketDir: "/var/lib/vhost_sockets"
  NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
  OvsDpdkDriverType: "vfio-pci"
-  OvsDpdkMemoryChannels: "4"

  #ComputeOvsDpdkParameters:
    ## Host configuration Parameters
--- a/extraconfig/pre_network/host_config_and_reboot.yaml
+++ b/extraconfig/pre_network/host_config_and_reboot.yaml
@ -35,7 +35,7 @@ parameters:
    type: string
    constraints:
      - allowed_pattern: "[0-9]*"
-    default: ""
+    default: "4"
    tags:
      - role_specific
  OvsDpdkSocketMemory:
--- a/puppet/services/openvswitch.yaml
+++ b/puppet/services/openvswitch.yaml
@ -45,7 +45,7 @@ parameters:
    type: string
    constraints:
      - allowed_pattern: "[0-9]*"
-    default: ""
+    default: "4"
    tags:
      - role_specific
  OvsDpdkSocketMemory: