Merge "Call VF configuration from udev rules"

3 files changed, 33 insertions, 4 deletions

diff --git a/manifests/host/sriov.pp b/manifests/host/sriov.pp
index a30db42..b94c472 100644
--- a/manifests/host/sriov.pp
+++ b/manifests/host/sriov.pp
@@ -21,7 +21,8 @@ class tripleo::host::sriov (
     # the numvfs configuration needs to be persisted for every boot
     tripleo::host::sriov::numvfs_persistence {'persistent_numvfs':
       vf_defs        => $number_of_vfs,
-      content_string => "#!/bin/bash\n"
+      content_string => "#!/bin/bash\n",
+      udev_rules     => ''
     }
   }
 }
diff --git a/manifests/host/sriov/numvfs_persistence.pp b/manifests/host/sriov/numvfs_persistence.pp
index 1ee402c..ec8c875 100644
--- a/manifests/host/sriov/numvfs_persistence.pp
+++ b/manifests/host/sriov/numvfs_persistence.pp
@@ -10,9 +10,16 @@
 # [*content_string*]
 #   (required) String which shall be written to the script file.
 #
+# [*udev_rules*]
+#   (required) String of lines to write to udev rules to ensure
+#   VFs are reconfigured if the PCI devices are removed and
+#   readded without rebooting (e.g. when physical functions were
+#   allocated to VMs)
+#
 define tripleo::host::sriov::numvfs_persistence(
   $vf_defs,
-  $content_string
+  $content_string,
+  $udev_rules
 ){
   # Since reduce isn't available, we use recursion to iterate each entries of
   # "physical_interface:vfs" and accumulate the content that needs to be
@@ -36,6 +43,16 @@ define tripleo::host::sriov::numvfs_persistence(
       replace => false
     }
 
+    file { '/etc/udev/rules.d/70-tripleo-reset-sriov.rules':
+      ensure  => file,
+      group   => 'root',
+      mode    => '0755',
+      owner   => 'root',
+      content => $udev_rules,
+      replace => true,
+    }
+
+
     file_line { 'call_ifup-local':
       path    => '/sbin/ifup-local',
       line    => '/etc/sysconfig/allocate_vfs $1',
@@ -46,9 +63,11 @@ define tripleo::host::sriov::numvfs_persistence(
     $interface = $vfspec[0]
     $count = $vfspec[1]
     $vfdef_str = "${content_string}[ \"${interface}\" == \"\$1\" ] && echo ${count} > /sys/class/net/${interface}/device/sriov_numvfs\n"
+    $udev_str = "${udev_rules}KERNEL==\"${interface}\", RUN+=\"/etc/sysconfig/allocate_vfs %k\"\n"
     tripleo::host::sriov::numvfs_persistence{"mapped ${interface}":
       vf_defs        => delete_at($vf_defs, 0),
-      content_string => $vfdef_str
+      content_string => $vfdef_str,
+      udev_rules     => $udev_str
     }
   }
 }
diff --git a/spec/defines/tripleo_host_sriov_numvfs_persistence_spec.rb b/spec/defines/tripleo_host_sriov_numvfs_persistence_spec.rb
index 57559a2..153b105 100644
--- a/spec/defines/tripleo_host_sriov_numvfs_persistence_spec.rb
+++ b/spec/defines/tripleo_host_sriov_numvfs_persistence_spec.rb
@@ -12,7 +12,8 @@ describe 'tripleo::host::sriov::numvfs_persistence' do
       {
         :name           => 'persistence',
         :vf_defs        => ['eth0:10','eth1:8'],
-        :content_string => "Hashbang\n"
+        :content_string => "Hashbang\n",
+        :udev_rules     => ""
       }
     end
 
@@ -31,6 +32,14 @@ describe 'tripleo::host::sriov::numvfs_persistence' do
         :content => '#!/bin/bash',
         :replace => false,
       )
+      is_expected.to contain_file('/etc/udev/rules.d/70-tripleo-reset-sriov.rules').with(
+        :ensure  => 'file',
+        :content => "KERNEL==\"eth0\", RUN+=\"/etc/sysconfig/allocate_vfs %k\"\nKERNEL==\"eth1\", RUN+=\"/etc/sysconfig/allocate_vfs %k\"\n",
+        :group   => 'root',
+        :mode    => '0755',
+        :owner   => 'root',
+        :replace => true
+      )
       is_expected.to contain_file_line('call_ifup-local').with(
         :path => '/sbin/ifup-local',
         :line => '/etc/sysconfig/allocate_vfs $1',