leapp upgrades with kernel args is not working as expected

[Saravanan KR]

During leapp upgrade the grub file is updated wrongly as below:

[root@overcloud-computeovsdpdk-0 ~]# cat /etc/default/grub
GRUB_TIMEOUT=5
GRUB_DISTRIBUTOR="$(sed 's, release .*$,,g' /etc/system-release)"
GRUB_DEFAULT=saved
GRUB_DISABLE_SUBMENU=true
GRUB_TERMINAL_OUTPUT="console"
GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8 crashkernel=auto rhgb quiet <<<<<---- Closing quote missing after leapp upgrade
TRIPLEO_HEAT_TEMPLATE_KERNEL_ARGS= default_hugepagesz=1GB hugepagesz=1G hugepages=20 iommu=pt intel_iommu=on isolcpus=2-11" <<<<<---- opening quote missing after leapp upgrade.
GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX:+$GRUB_CMDLINE_LINUX }${TRIPLEO_HEAT_TEMPLATE_KERNEL_ARGS}"
GRUB_DISABLE_RECOVERY="true"
GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_DEFAULT:+$GRUB_CMDLINE_LINUX_DEFAULT }\$tuned_params"
GRUB_INITRD_OVERLAY="${GRUB_INITRD_OVERLAY:+$GRUB_INITRD_OVERLAY }\$tuned_initrd"
GRUB_ENABLE_BLSCFG=true

This is beacause, leapp does not consider any entry starting other than GRUB.

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/744388

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/744388
Committed: https://git.openstack.org/cgit/openstack/tripleo-upgrade/commit/?id=e5197c4469c7d85c86a8c0f73638bc3d44f919e3
Submitter: Zuul
Branch: master

commit e5197c4469c7d85c86a8c0f73638bc3d44f919e3
Author: Saravanan KR <email address hidden>
Date: Sun Aug 2 16:21:06 2020 +0530

    Add BootParams service to all roles

    BootParams service should be added to all the roles during
    the ugprade. It is responsible to set the kernel args and
    reboot if required.
    Related-Bug: #1890080

    Change-Id: Id68c62486e8b12e21931a4255da48effb0ed4690

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/742625
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=f217eccc7720250a64a0877061063acf0951b495
Submitter: Zuul
Branch: master

commit f217eccc7720250a64a0877061063acf0951b495
Author: Saravanan KR <email address hidden>
Date: Thu Jul 23 14:38:25 2020 +0530

    Align kernel args for system upgrade using leapp

    leapp is looking for errors in /etc/default/grub and
    fixes it during upgrade. It does not recognize entries
    starting other than "GRUB", as tripleo sets the entry
    starting with TRIPLEO_ instead of GRUB, append the
    entry with GRUB_ so that leapp upgrades correctly.
    Closes-Bug: #1890080
    Change-Id: I9238cd35a1114b1649a38ab4f24225865bcecf19

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/ussuri
Review: https://review.opendev.org/745058

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/train
Review: https://review.opendev.org/745059

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/ussuri
Review: https://review.opendev.org/745060

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/train
Review: https://review.opendev.org/745061

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/745058
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=28ed5c0b83f594dae6cfdc266648a64e852adbab
Submitter: Zuul
Branch: stable/ussuri

commit 28ed5c0b83f594dae6cfdc266648a64e852adbab
Author: Saravanan KR <email address hidden>
Date: Thu Jul 23 14:38:25 2020 +0530

    Align kernel args for system upgrade using leapp

    leapp is looking for errors in /etc/default/grub and
    fixes it during upgrade. It does not recognize entries
    starting other than "GRUB", as tripleo sets the entry
    starting with TRIPLEO_ instead of GRUB, append the
    entry with GRUB_ so that leapp upgrades correctly.
    Closes-Bug: #1890080
    Change-Id: I9238cd35a1114b1649a38ab4f24225865bcecf19
    (cherry picked from commit f217eccc7720250a64a0877061063acf0951b495)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/745059
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=2f382ac90a635e8f5d0f2244be4b18893ec82202
Submitter: Zuul
Branch: stable/train

commit 2f382ac90a635e8f5d0f2244be4b18893ec82202
Author: Saravanan KR <email address hidden>
Date: Thu Jul 23 14:38:25 2020 +0530

    Align kernel args for system upgrade using leapp

    leapp is looking for errors in /etc/default/grub and
    fixes it during upgrade. It does not recognize entries
    starting other than "GRUB", as tripleo sets the entry
    starting with TRIPLEO_ instead of GRUB, append the
    entry with GRUB_ so that leapp upgrades correctly.
    Closes-Bug: #1890080
    Change-Id: I9238cd35a1114b1649a38ab4f24225865bcecf19
    (cherry picked from commit f217eccc7720250a64a0877061063acf0951b495)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/745060
Committed: https://git.openstack.org/cgit/openstack/tripleo-upgrade/commit/?id=8ed2b58d39d103fd9c7ea03d80a771d89a50c518
Submitter: Zuul
Branch: stable/ussuri

commit 8ed2b58d39d103fd9c7ea03d80a771d89a50c518
Author: Saravanan KR <email address hidden>
Date: Sun Aug 2 16:21:06 2020 +0530

    Add BootParams service to all roles

    BootParams service should be added to all the roles during
    the ugprade. It is responsible to set the kernel args and
    reboot if required.
    Related-Bug: #1890080

    Change-Id: Id68c62486e8b12e21931a4255da48effb0ed4690
    (cherry picked from commit e5197c4469c7d85c86a8c0f73638bc3d44f919e3)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/745061
Committed: https://git.openstack.org/cgit/openstack/tripleo-upgrade/commit/?id=51429783dac83feadb72561aa6caa8da970b0001
Submitter: Zuul
Branch: stable/train

commit 51429783dac83feadb72561aa6caa8da970b0001
Author: Saravanan KR <email address hidden>
Date: Sun Aug 2 16:21:06 2020 +0530

    Add BootParams service to all roles

    BootParams service should be added to all the roles during
    the ugprade. It is responsible to set the kernel args and
    reboot if required.
    Related-Bug: #1890080

    Change-Id: Id68c62486e8b12e21931a4255da48effb0ed4690
    (cherry picked from commit e5197c4469c7d85c86a8c0f73638bc3d44f919e3)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 11.4.0 release.