Merge "Conform dpdk settings to ovs 2.6"

openstack-archive · Dec 6, 2016 · c36bf66 · c36bf66
2 parents 8115edb + 2bcebb8
commit c36bf66
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 27 deletions.
diff --git a/deployment/Puppetfile b/deployment/Puppetfile
@@ -156,3 +156,8 @@ mod 'mysql',
 mod 'galera',
     :git => 'https://github.com/fuel-infra/puppet-galera.git',
     :ref => '0.0.6'
+
+# Pull in puppet-vswitch
+mod 'vswitch',
+    :git => 'https://github.com/fuel-infra/puppet-vswitch.git',
+    :ref => '6.0.0'
diff --git a/deployment/puppet/l23network/manifests/l2/dpdk.pp b/deployment/puppet/l23network/manifests/l2/dpdk.pp
@@ -35,7 +35,6 @@
   $dpdk_dir                    = $::l23network::params::dpdk_dir,
   $dpdk_conf_file              = $::l23network::params::dpdk_conf_file,
   $dpdk_interfaces_file        = $::l23network::params::dpdk_interfaces_file,
-  $ovs_default_file            = $::l23network::params::ovs_default_file,
   $install_ovs                 = $::l23network::l2::install_ovs,
   $ensure_package              = 'present',
 ) inherits ::l23network::params {
@@ -61,10 +60,6 @@
       }
       File[$dpdk_interfaces_file] ~> Service['dpdk']
       File[$dpdk_interfaces_file] ~> Service['openvswitch-service']
-
-      if $ovs_default_file {
-        File[$dpdk_interfaces_file] -> File[$ovs_default_file]
-      }
     } else {
       warning('DPDK was not configured')
     }
@@ -88,39 +83,35 @@
       hasstatus => true,
     } -> Anchor['l23network::l2::dpdk']
 
-    # Configure OpenVSwitch to use DPDK
-    if $ovs_default_file {
-      file {$ovs_default_file:
-        ensure  => 'present',
-        content => template('l23network/openvswitch_default_Debian.erb'),
-      } ~> Service['openvswitch-service']
-    }
-
     # Install DPDK-enabled OpenVSwitch
     if $_install_dpdk and $install_ovs and $ovs_dpdk_package_name {
       package {'openvswitch-dpdk':
         ensure => $ensure_package,
         name   => $ovs_dpdk_package_name,
       } ~> Service['openvswitch-service']
-
-      if $ovs_default_file {
-        Package['openvswitch-dpdk'] -> File[$ovs_default_file]
-      }
     } else {
       warning('OpenVSwitch DPDK was not installed')
     }
 
     # Configure OVS DPDK PMD in runtime (it's safe to re-set it)
     if $ovs_pmd_core_mask {
-      $ovs_pmd_core_mask_cmd = "ovs-vsctl set Open_vSwitch . other_config:pmd-cpu-mask=${$ovs_pmd_core_mask}"
+      $ovs_pmd_core_mask_opts = { value => $ovs_pmd_core_mask }
     } else {
-      $ovs_pmd_core_mask_cmd = 'ovs-vsctl remove Open_vSwitch . other_config pmd-cpu-mask'
+      $ovs_pmd_core_mask_opts = { ensure => 'absent' }
     }
-    exec { 'ovs_pmd_core_mask':
-      command => $ovs_pmd_core_mask_cmd,
-      path    => '/bin:/usr/bin:/usr/local/bin',
-      require => Service['openvswitch-service'],
-    } -> Anchor['l23network::l2::dpdk']
+
+    # Configure OpenVSwitch to use DPDK
+    $vs_config = {
+      'other_config:dpdk-init'       => { value => 'true' },
+      'other_config:dpdk-socket-mem' => { value => $ovs_socket_mem },
+      'other_config:dpdk-lcore-mask' => { value => $ovs_core_mask },
+      'other_config:dpdk-extra'      => { value => "-n ${ovs_memory_channels}" },
+      'other_config:pmd-cpu-mask'    => { value => $ovs_pmd_core_mask_opts },
+    }
+
+    create_resources('vs_config', $vs_config)
+
+    Package<| title=='openvswitch-common' |> -> Vs_config<||> ~> Service['openvswitch-service']
 
     # Install ifupdown scripts
     if $::l23_os =~ /(?i)ubuntu/ {

diff --git a/deployment/puppet/l23network/manifests/params.pp b/deployment/puppet/l23network/manifests/params.pp
@@ -9,7 +9,6 @@
       $interfaces_file            = '/etc/network/interfaces'
       $ovs_service_name           = 'openvswitch-switch'
       $ovs_status_cmd             = '/etc/init.d/openvswitch-switch status'
-      $ovs_default_file           = '/etc/default/openvswitch-switch'
       $lnx_vlan_tools             = 'vlan'
       $lnx_bond_tools             = 'ifenslave'
       $lnx_ethernet_tools         = 'ethtool'
@@ -33,7 +32,6 @@
       $interfaces_file            = undef
       $ovs_service_name           = 'openvswitch'
       $ovs_status_cmd             = '/etc/init.d/openvswitch status'
-      $ovs_default_file           = undef
       $lnx_vlan_tools             = undef
       $lnx_bond_tools             = undef
       $lnx_ethernet_tools         = 'ethtool'
@@ -59,7 +57,6 @@
       $interfaces_dir             = '/tmp/1'
       $interfaces_file            = undef
       $ovs_service_name           = undef
-      $ovs_default_file           = undef
       $lnx_vlan_tools             = undef
       $lnx_bond_tools             = undef
       $lnx_ethernet_tools         = undef