import ceph pacific 16.2.5

[ceph.git] / ceph / src / pybind / mgr / dashboard / frontend / src / app / ceph / nfs / nfs-form / nfs-form.component.ts

diff --git a/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.ts b/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.ts
index 5234be1404e8e1f8cc72348b3b4a57750bb84efc..3e23b9878b95d82c9bdc3feb6efe9e679d97aae2 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.ts
+++ b/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.ts
@@ -174,7 +174,7 @@ export class NfsFormComponent extends CdForm implements OnInit {
         })
       }),
       path: new FormControl(''),
-      protocolNfsv3: new FormControl(true, {
+      protocolNfsv3: new FormControl(false, {
         validators: [
           CdValidators.requiredIf({ protocolNfsv4: false }, (value: boolean) => {
             return !value;
@@ -301,7 +301,8 @@ export class NfsFormComponent extends CdForm implements OnInit {
           this.rgwUserService.list().subscribe((result: any) => {
             result.forEach((user: Record<string, any>) => {
               if (user.suspended === 0 && user.keys.length > 0) {
-                this.allRgwUsers.push(user.user_id);
+                const userId = user.tenant ? `${user.tenant}$${user.user_id}` : user.user_id;
+                this.allRgwUsers.push(userId);
               }
             });
           });