diff --git a/sysinv/cgts-client/centos/build_srpm.data b/sysinv/cgts-client/centos/build_srpm.data index 4e6fbe9ae4..d47350caef 100644 --- a/sysinv/cgts-client/centos/build_srpm.data +++ b/sysinv/cgts-client/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="cgts-client" -TIS_PATCH_VER=73 +TIS_PATCH_VER=74 diff --git a/sysinv/cgts-client/cgts-client/cgtsclient/v1/isystem_shell.py b/sysinv/cgts-client/cgts-client/cgtsclient/v1/isystem_shell.py index c702b601bc..76fced8dec 100644 --- a/sysinv/cgts-client/cgts-client/cgtsclient/v1/isystem_shell.py +++ b/sysinv/cgts-client/cgts-client/cgtsclient/v1/isystem_shell.py @@ -86,7 +86,9 @@ def do_show(cc, args): @utils.arg('-S', '--security_feature', metavar='', choices=['spectre_meltdown_v1', 'spectre_meltdown_all'], - help='Use spectre_meltdown_v1 for spectre/meltdown v1 fixes, or spectre_meltdown_all to use all fixes') + help='Use spectre_meltdown_v1 to add linux bootargs "nopti ' + 'nospectre_v2 nospectre_v1", or spectre_meltdown_all to not ' + 'add any mitigation disabling bootargs') def do_modify(cc, args): """Modify system attributes.""" isystems = cc.isystem.list() diff --git a/sysinv/sysinv/centos/build_srpm.data b/sysinv/sysinv/centos/build_srpm.data index 5e63e56302..7daffe0850 100644 --- a/sysinv/sysinv/centos/build_srpm.data +++ b/sysinv/sysinv/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="sysinv" -TIS_PATCH_VER=341 +TIS_PATCH_VER=342 diff --git a/sysinv/sysinv/sysinv/sysinv/common/constants.py b/sysinv/sysinv/sysinv/sysinv/common/constants.py index a46d7c883f..207fcee384 100644 --- a/sysinv/sysinv/sysinv/sysinv/common/constants.py +++ b/sysinv/sysinv/sysinv/sysinv/common/constants.py @@ -1350,7 +1350,7 @@ GLANCE_REGISTRY_DATA_API = 'glance.db.registry.api' # kernel options for various security feature selections SYSTEM_SECURITY_FEATURE_SPECTRE_MELTDOWN_V1 = 'spectre_meltdown_v1' -SYSTEM_SECURITY_FEATURE_SPECTRE_MELTDOWN_V1_OPTS = 'nopti nospectre_v2' +SYSTEM_SECURITY_FEATURE_SPECTRE_MELTDOWN_V1_OPTS = 'nopti nospectre_v2 nospectre_v1' SYSTEM_SECURITY_FEATURE_SPECTRE_MELTDOWN_ALL = 'spectre_meltdown_all' SYSTEM_SECURITY_FEATURE_SPECTRE_MELTDOWN_ALL_OPTS = '' SYSTEM_SECURITY_FEATURE_SPECTRE_MELTDOWN_OPTS = { diff --git a/tsconfig/centos/build_srpm.data b/tsconfig/centos/build_srpm.data index e574177685..6d0c787215 100644 --- a/tsconfig/centos/build_srpm.data +++ b/tsconfig/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="tsconfig" -TIS_PATCH_VER=10 +TIS_PATCH_VER=11 diff --git a/tsconfig/tsconfig/tsconfig/tests/test_basics.py b/tsconfig/tsconfig/tsconfig/tests/test_basics.py index c88f406b81..1ede002a14 100644 --- a/tsconfig/tsconfig/tsconfig/tests/test_basics.py +++ b/tsconfig/tsconfig/tsconfig/tests/test_basics.py @@ -60,7 +60,7 @@ sdn_enabled=no region_config=no system_mode=duplex sw_version=19.12 -security_feature="nopti nospectre_v2" +security_feature="nopti nospectre_v2 nospectre_v1" vswitch_type=ovs-dpdk """ @@ -82,7 +82,7 @@ region_2_name=Region2 distributed_cloud_role=CloudRole system_mode=duplex sw_version=19.12 -security_feature="nopti nospectre_v2" +security_feature="nopti nospectre_v2 nospectre_v1" vswitch_type=ovs-dpdk """