diff --git a/etc-conf/subscription-manager.completion.sh b/etc-conf/subscription-manager.completion.sh index 0e0f25047f..67863c786d 100644 --- a/etc-conf/subscription-manager.completion.sh +++ b/etc-conf/subscription-manager.completion.sh @@ -269,7 +269,7 @@ _subscription_manager() # top-level commands and options opts="attach auto-attach clean config environments facts identity import list orgs - repo-override plugins redeem refresh register release remove repos role service-level status + repo-override plugins redeem refresh register release remove repos service-level status syspurpose unregister usage version ${_subscription_manager_help_opts}" case "${first}" in @@ -287,7 +287,6 @@ _subscription_manager() register|\ release|\ repos|\ - role|\ status|\ syspurpose|\ unregister|\ diff --git a/man/subscription-manager.8 b/man/subscription-manager.8 index 4fb88b58b7..d7bfb2d3d1 100644 --- a/man/subscription-manager.8 +++ b/man/subscription-manager.8 @@ -138,7 +138,7 @@ must be passed as system arguments in a non-interactive session. .RE -Following commands were deprecated: role, service-level, subscribe, unsubscribe, usage, and activate +Following commands were deprecated: service-level, subscribe, unsubscribe, usage, and activate .SS COMMON OPTIONS .TP @@ -1039,10 +1039,6 @@ This has been replaced with \fBremove\fP. .B activate This has been replaced with \fBredeem\fP. -.TP -.B role -This has been replaced with \fBsyspurpose role\fP. - .TP .B service-level This has been replaced with \fBsyspurpose service-level\fP. diff --git a/src/subscription_manager/cli_command/syspurpose.py b/src/subscription_manager/cli_command/syspurpose.py index 3b98242c7b..bdeff3fd30 100644 --- a/src/subscription_manager/cli_command/syspurpose.py +++ b/src/subscription_manager/cli_command/syspurpose.py @@ -37,9 +37,9 @@ class SyspurposeCommand(CliCommand): """ Syspurpose command for generic actions. This command replaced the addons - command and will be used for all syspurpose actions in the future. It will - replace role, service-level and usage commands too. It will be possible to - set service-type using this command. + and role commands and will be used for all syspurpose actions in the + future. It will replace service-level and usage commands too. It will be + possible to set service-type using this command. Note: when the system is not registered, then it doesn't make any sense to synchronize syspurpose values with candlepin server, because consumer diff --git a/src/subscription_manager/managercli.py b/src/subscription_manager/managercli.py index 2b6a03bdb1..80f87a63a7 100644 --- a/src/subscription_manager/managercli.py +++ b/src/subscription_manager/managercli.py @@ -41,7 +41,6 @@ from subscription_manager.cli_command.release import ReleaseCommand from subscription_manager.cli_command.remove import RemoveCommand from subscription_manager.cli_command.repos import ReposCommand -from subscription_manager.cli_command.role import RoleCommand from subscription_manager.cli_command.service_level import ServiceLevelCommand from subscription_manager.cli_command.status import StatusCommand from subscription_manager.cli_command.syspurpose import SyspurposeCommand @@ -78,7 +77,6 @@ def __init__(self): PluginsCommand, AutohealCommand, OverrideCommand, - RoleCommand, UsageCommand, FactsCommand, SyspurposeCommand,