Call VF configuration from udev rules
When a physical function that was allocated to a guest is released back the system, it is not automatically brought "up" and the VF configuration is not restored. This patch creates a file containing some udev rules to force the VF configuration. Note: we may find that the ifup-local script is no longer required but this will require further testing. Change-Id: Ie6e78730aa0a748b3b5100ab7c7bc007d8ab176d Partial-Bug: #1639901
This commit is contained in:
@@ -21,7 +21,8 @@ class tripleo::host::sriov (
|
|||||||
# the numvfs configuration needs to be persisted for every boot
|
# the numvfs configuration needs to be persisted for every boot
|
||||||
tripleo::host::sriov::numvfs_persistence {'persistent_numvfs':
|
tripleo::host::sriov::numvfs_persistence {'persistent_numvfs':
|
||||||
vf_defs => $number_of_vfs,
|
vf_defs => $number_of_vfs,
|
||||||
content_string => "#!/bin/bash\n"
|
content_string => "#!/bin/bash\n",
|
||||||
|
udev_rules => ''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -10,9 +10,16 @@
|
|||||||
# [*content_string*]
|
# [*content_string*]
|
||||||
# (required) String which shall be written to the script file.
|
# (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(
|
define tripleo::host::sriov::numvfs_persistence(
|
||||||
$vf_defs,
|
$vf_defs,
|
||||||
$content_string
|
$content_string,
|
||||||
|
$udev_rules
|
||||||
){
|
){
|
||||||
# Since reduce isn't available, we use recursion to iterate each entries of
|
# Since reduce isn't available, we use recursion to iterate each entries of
|
||||||
# "physical_interface:vfs" and accumulate the content that needs to be
|
# "physical_interface:vfs" and accumulate the content that needs to be
|
||||||
@@ -36,6 +43,16 @@ define tripleo::host::sriov::numvfs_persistence(
|
|||||||
replace => false
|
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':
|
file_line { 'call_ifup-local':
|
||||||
path => '/sbin/ifup-local',
|
path => '/sbin/ifup-local',
|
||||||
line => '/etc/sysconfig/allocate_vfs $1',
|
line => '/etc/sysconfig/allocate_vfs $1',
|
||||||
@@ -46,9 +63,11 @@ define tripleo::host::sriov::numvfs_persistence(
|
|||||||
$interface = $vfspec[0]
|
$interface = $vfspec[0]
|
||||||
$count = $vfspec[1]
|
$count = $vfspec[1]
|
||||||
$vfdef_str = "${content_string}[ \"${interface}\" == \"\$1\" ] && echo ${count} > /sys/class/net/${interface}/device/sriov_numvfs\n"
|
$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}":
|
tripleo::host::sriov::numvfs_persistence{"mapped ${interface}":
|
||||||
vf_defs => delete_at($vf_defs, 0),
|
vf_defs => delete_at($vf_defs, 0),
|
||||||
content_string => $vfdef_str
|
content_string => $vfdef_str,
|
||||||
|
udev_rules => $udev_str
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -12,7 +12,8 @@ describe 'tripleo::host::sriov::numvfs_persistence' do
|
|||||||
{
|
{
|
||||||
:name => 'persistence',
|
:name => 'persistence',
|
||||||
:vf_defs => ['eth0:10','eth1:8'],
|
:vf_defs => ['eth0:10','eth1:8'],
|
||||||
:content_string => "Hashbang\n"
|
:content_string => "Hashbang\n",
|
||||||
|
:udev_rules => ""
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -31,6 +32,14 @@ describe 'tripleo::host::sriov::numvfs_persistence' do
|
|||||||
:content => '#!/bin/bash',
|
:content => '#!/bin/bash',
|
||||||
:replace => false,
|
: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(
|
is_expected.to contain_file_line('call_ifup-local').with(
|
||||||
:path => '/sbin/ifup-local',
|
:path => '/sbin/ifup-local',
|
||||||
:line => '/etc/sysconfig/allocate_vfs $1',
|
:line => '/etc/sysconfig/allocate_vfs $1',
|
||||||
|
Reference in New Issue
Block a user