Update ironic-agent-multipath element
It finally was tested on real environments, and it was not
working properly. The generated image is not build with
dracut, so the regenerate we did there was not used, and the
modules were not enabled.
Adding the modules on the right directory, to be loaded at
boot time.
Also removing the 98-regenerate-initramfs patch, because it
was regenerating an image that is never used, so it was a
no-op
Change-Id: I87527a4ac2111f1e572e3c779e11fdf20fc88bc8
(cherry picked from commit 22a5e4e50f
)
This commit is contained in:
parent
526772d36e
commit
2e61e31916
|
@ -1,10 +1,7 @@
|
|||
======================
|
||||
ironic-agent-multipath
|
||||
======================
|
||||
Updates the ironic agent, installing multipath package,
|
||||
and rebuilding dracut to add the specified drivers.
|
||||
Updates the ironic agent, installing multipath and
|
||||
iscsi package, and enabling needed modules by default,
|
||||
to execute a modprobe for the needed drivers before it is started.
|
||||
|
||||
The drivers to add can be specified with the
|
||||
`IRONIC_AGENT_MULTIPATH_DRIVERS`. It accepts a list of
|
||||
drivers to add separated by spaces. The default values are
|
||||
'be2iscsi iscsi_target_mod dm_multipath'.
|
||||
|
|
|
@ -1,2 +1,3 @@
|
|||
install-static
|
||||
package-installs
|
||||
select-boot-kernel-initrd
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
if [ -z "${IRONIC_AGENT_MULTIPATH_DRIVERS:-}" ]; then
|
||||
export IRONIC_AGENT_MULTIPATH_DRIVERS=${IRONIC_AGENT_MULTIPATH_DRIVERS:-"be2iscsi iscsi_target_mod dm_multipath"}
|
||||
fi
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
||||
set -x
|
||||
fi
|
||||
set -eu
|
||||
set -o pipefail
|
||||
|
||||
RET=$(select-boot-kernel-initrd)
|
||||
KERNEL_VERSION=`echo ${RET%:*} | sed 's/vmlinuz-//g'`
|
||||
RAMDISK=/boot/${RET#*:}
|
||||
|
||||
if [ -z $IRONIC_AGENT_MULTIPATH_DRIVERS ]; then
|
||||
dracut -v --force $RAMDISK $KERNEL_VERSION
|
||||
else
|
||||
dracut -v --force --add-drivers "$IRONIC_AGENT_MULTIPATH_DRIVERS" $RAMDISK $KERNEL_VERSION
|
||||
fi
|
|
@ -0,0 +1,9 @@
|
|||
qla4xxx
|
||||
cxgb3i
|
||||
cxgb4i
|
||||
bnx2i
|
||||
be2iscsi
|
||||
iscsi_boot_sysfs
|
||||
iscsi_ibft
|
||||
iscsi_tcp
|
||||
target_core_mod
|
Loading…
Reference in New Issue