[PATCH manager 1/1] cephx: rename 'consumer' to 'client' in output and comments

[PATCH manager 1/1] cephx: rename 'consumer' to 'client' in output and comments

[Michael Köppl]

'Client' is the term more often used in the Proxmox VE documentation and
'consumer' has been replaced by 'client' in the Ceph documentation to
avoid confusion [0]. `pveceph auth status` and the cephx health hints in
the GUI still used the old 'consumer'. Update output strings and
comments accordingly. This change is made to conform to the updated
documentation and the naming change in the cephx migration script.

[0] https://docs.ceph.com/en/latest/dev/cephx/

Signed-off-by: Michael Köppl <m.koeppl@proxmox.com>
---
Sent as a separate patch but meant as a follow-up to [1].

[1] https://lore.proxmox.com/pve-devel/20260915131651.515520-1-m.koeppl@proxmox.com

 PVE/CLI/pveceph.pm          | 2 +-
 PVE/Ceph/Services.pm        | 4 ++--
 test/CephAuth_test.pl       | 8 ++++----
 www/manager6/ceph/Status.js | 8 +++-----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/PVE/CLI/pveceph.pm b/PVE/CLI/pveceph.pm
index 847db2ab0..df6d23987 100755
--- a/PVE/CLI/pveceph.pm
+++ b/PVE/CLI/pveceph.pm
@@ -642,7 +642,7 @@ sub format_auth_status {
         );
     }
     print
-        "\nConsumer refresh, including disconnected consumers and external copies, is not verified here.\n";
+        "\nClient refresh, including disconnected clients and external copies, is not verified here.\n";
 }
 
 __PACKAGE__->register_method({
diff --git a/PVE/Ceph/Services.pm b/PVE/Ceph/Services.pm
index 0793306cf..38fd98020 100644
--- a/PVE/Ceph/Services.pm
+++ b/PVE/Ceph/Services.pm
@@ -935,7 +935,7 @@ my sub count_old_cipher_entities {
     return $count;
 }
 
-# This view has no staging journal or consumer inventory. Pending keys take precedence over
+# This view has no staging journal or client inventory. Pending keys take precedence over
 # rotation previews, regardless of who staged them or which cipher they would restore.
 sub cephx_migration_verdicts {
     my ($status) = @_;
@@ -1016,7 +1016,7 @@ sub cephx_migration_verdicts {
             . " any keys outside that selection:",
             "$CEPHX_MIGRATION_HELPER --rotate-all-storage-keys --rotate-admin-key";
     } else {
-        # Current keys do not prove that consumers refreshed or that cipher restriction is safe.
+        # Current keys do not prove that clients refreshed or that cipher restriction is safe.
         push @$res,
             "For a helper-managed migration, check whether anything remains:",
             $CEPHX_MIGRATION_HELPER;
diff --git a/test/CephAuth_test.pl b/test/CephAuth_test.pl
index 8b64a61a8..bcd76a8c1 100755
--- a/test/CephAuth_test.pl
+++ b/test/CephAuth_test.pl
@@ -164,8 +164,8 @@ like($current_text, qr/not guests, mounts, or sessions/, 'counts are not workloa
 like($current_text, qr/none active/, 'a successful empty health read says none active');
 unlike(
     $current_text,
-    qr/--rotate-|--restrict|migration complete|consumers (?:are )?refreshed/,
-    'current keys do not imply further rotations, restriction safety, or refreshed consumers',
+    qr/--rotate-|--restrict|migration complete|clients (?:are )?refreshed/,
+    'current keys do not imply further rotations, restriction safety, or refreshed clients',
 );
 like($current_text, qr/^  \Q$helper\E$/m, 'the all-current helper readiness command is standalone');
 like(
@@ -226,8 +226,8 @@ is(
 );
 like(
     $fresh_text,
-    qr/Consumer refresh, including disconnected consumers and external copies, is not verified here/,
-    'grouped old keys retain consumer and saved-copy limits',
+    qr/Client refresh, including disconnected clients and external copies, is not verified here/,
+    'grouped old keys retain client and saved-copy limits',
 );
 
 my $mixed_replies = dclone($fresh_replies);
diff --git a/www/manager6/ceph/Status.js b/www/manager6/ceph/Status.js
index 86d616995..e9da6f2c8 100644
--- a/www/manager6/ceph/Status.js
+++ b/www/manager6/ceph/Status.js
@@ -51,15 +51,13 @@ const CEPHX_CIPHER_HOWTO = {
     ),
     AUTH_INSECURE_CLIENT_KEY_TYPE: gettext(
         'Use the migration helper for cluster-owned keys and keys of compatible Ceph users.' +
-            ' Leave user keys required by incompatible consumers unchanged.',
+            ' Leave user keys required by incompatible clients unchanged.',
     ),
     AUTH_INSECURE_KEYS_ALLOWED: gettext(
-        'Keep aes enabled while any key or consumer still needs it. Restrict the ciphers only' +
+        'Keep aes enabled while any key or client still needs it. Restrict the ciphers only' +
             ' after the migration helper reports no blocker.',
     ),
-    AUTH_INSECURE_KEYS_CREATABLE: gettext(
-        'Finish the migration after no key or consumer needs aes.',
-    ),
+    AUTH_INSECURE_KEYS_CREATABLE: gettext('Finish the migration after no key or client needs aes.'),
     AUTH_INSECURE_ROTATING_SERVICE_KEY_TYPE: gettext(
         'This usually clears within a few hours after the monitors start issuing aes256k' +
             ' service tickets.',
-- 
2.47.3

Re: [PATCH manager 1/1] cephx: rename 'consumer' to 'client' in output and comments

[Jonas Theisen]

On 9/15/26 16:50, Michael Köppl wrote:
> 'Client' is the term more often used in the Proxmox VE documentation and
> 'consumer' has been replaced by 'client' in the Ceph documentation to
> avoid confusion [0]. `pveceph auth status` and the cephx health hints in
> the GUI still used the old 'consumer'. Update output strings and
> comments accordingly. This change is made to conform to the updated
> documentation and the naming change in the cephx migration script.
>
> [0] https://docs.ceph.com/en/latest/dev/cephx/
>
> Signed-off-by: Michael Köppl <m.koeppl@proxmox.com>
> ---
> Sent as a separate patch but meant as a follow-up to [1].
>
> [1] https://lore.proxmox.com/pve-devel/20260915131651.515520-1-m.koeppl@proxmox.com
>
> <snip>

Looks good to me.
Nearly all the remaining occurrences of 'consumer' are
in variable or function names.
There are still two 'consumers' in Services.pm line 938 and 1019
but since these are code comments i don't see that as a blocker.

Consider this:
Reviewed-by: Jonas Theisen <j.theisen@proxmox.com>

Re: [PATCH manager 1/1] cephx: rename 'consumer' to 'client' in output and comments

[Maximiliano Sandoval]

Michael Köppl <m.koeppl@proxmox.com> writes:

> 'Client' is the term more often used in the Proxmox VE documentation and
> 'consumer' has been replaced by 'client' in the Ceph documentation to
> avoid confusion [0]. `pveceph auth status` and the cephx health hints in
> the GUI still used the old 'consumer'. Update output strings and
> comments accordingly. This change is made to conform to the updated
> documentation and the naming change in the cephx migration script.
>
> [0] https://docs.ceph.com/en/latest/dev/cephx/
>
> Signed-off-by: Michael Köppl <m.koeppl@proxmox.com>

This is a follow-up of
https://lore.proxmox.com/pve-devel/20260908153932.577051-2-m.sandoval@proxmox.com/.

Looks good to me.

Reviewed-by: Maximiliano Sandoval <m.sandoval@proxmox.com>

-- 
Maximiliano