Skip to content

Commit b02c45b

Browse files
nizamial09nizamial09
authored
Merge pull request ceph#53307 from rhcs-dashboard/fix-62721-main
mgr/dashboard: Rgw Multi-site naming improvements Reviewed-by: Pedro Gonzalez Gomez <[email protected]> Reviewed-by: Nizamudeen A <[email protected]>
2 parents e77aa44 + e3d8ac0 commit b02c45b

File tree

13 files changed

+68
-44
lines changed

13 files changed

+68
-44
lines changed

‎src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
i18n>
1414
<a class="text-decoration-underline"
1515
(click)="createMultisiteSetup()">
16-
Click here</a> to create a new realm/zonegroup/zone
16+
Click here</a> to create a new Realm/Zone Group/Zone
1717
</cd-alert-panel>
1818
<!-- Service type -->
1919
<div class="form-group row">
@@ -122,7 +122,7 @@
122122
*ngIf="serviceForm.controls.service_type.value === 'rgw'">
123123
<label class="cd-col-form-label"
124124
for="zonegroup_name"
125-
i18n>Zonegroup</label>
125+
i18n>Zone Group</label>
126126
<div class="cd-col-form-input">
127127
<select class="form-select"
128128
id="zonegroup_name"

‎src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<cd-modal [modalRef]="activeModal">
22
<ng-container i18n="form title"
3-
class="modal-title">Create Realm/Zonegroup/Zone
3+
class="modal-title">Create Realm/Zone Group/Zone
44
</ng-container>
55

66
<ng-container class="modal-content">
@@ -10,7 +10,7 @@
1010
novalidate>
1111
<div class="modal-body">
1212
<cd-alert-panel type="info"
13-
spacingClass="mb-3">The realm/zonegroup/zone created will be set as default and master.
13+
spacingClass="mb-3">The realm/zone group/zone created will be set as default and master.
1414
</cd-alert-panel>
1515
<div class="form-group row">
1616
<label class="cd-col-form-label required"
@@ -31,11 +31,11 @@
3131
<div class="form-group row">
3232
<label class="cd-col-form-label required"
3333
for="zonegroupName"
34-
i18n>Zonegroup Name</label>
34+
i18n>Zone Group Name</label>
3535
<div class="cd-col-form-input">
3636
<input class="form-control"
3737
type="text"
38-
placeholder="Zonegroup name..."
38+
placeholder="Zone group name..."
3939
id="zonegroupName"
4040
name="zonegroupName"
4141
formControlName="zonegroupName">

‎src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zonegroup-deletion-form/rgw-multisite-zonegroup-deletion-form.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<cd-modal [modalRef]="activeModal">
22
<ng-container i18n="form title"
3-
class="modal-title">Delete Zonegroup</ng-container>
3+
class="modal-title">Delete Zone Group</ng-container>
44

55
<ng-container class="modal-content">
66
<form name="zonegroupForm"
77
[formGroup]="zonegroupForm"
88
novalidate>
99
<div class="modal-body ms-4">
1010
<label i18n>
11-
This will delete your <strong>{{zonegroup?.name}}</strong> Zonegroup.
11+
This will delete your <strong>{{zonegroup?.name}}</strong> Zone Group.
1212
</label>
1313
<ng-container *ngIf="zonesList.length > 0">
1414
<label class="mt-3"
1515
i18n>
16-
Do you want to delete the associated zones and pools with the <strong>{{zonegroup?.name}}</strong> Zonegroup?</label>
16+
Do you want to delete the associated zones and pools with the <strong>{{zonegroup?.name}}</strong> Zone Group?</label>
1717
<ng-container *ngIf="includedPools.size > 0">
1818
<label i18n>
1919
This will delete the following:</label>

‎src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<cd-alert-panel *ngIf="!rgwModuleStatus"
55
type="info"
66
spacingClass="mb-3"
7-
i18n>You need to enable the rgw module to access the import/export feature.
7+
i18n>In order to access the import/export feature, the rgw module must be enabled
88
<a class="text-decoration-underline"
99
(click)="enableRgwModule()">
10-
Enable RGW Module</a>
10+
Enable the Object Gateway Module</a>
1111
</cd-alert-panel>
1212
<cd-alert-panel *ngIf="restartGatewayMessage"
1313
type="warning"

‎src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ export class RgwMultisiteDetailsComponent implements OnDestroy, OnInit {
5050

5151
messages = {
5252
noDefaultRealm: $localize`Please create a default realm first to enable this feature`,
53-
noMasterZone: $localize`Please create a master zone for each zonegroups to enable this feature`,
53+
noMasterZone: $localize`Please create a master zone for each zone group to enable this feature`,
5454
noRealmExists: $localize`No realm exists`,
55-
disableExport: $localize`Please create master zonegroup and master zone for each of the realms`
55+
disableExport: $localize`Please create master zone group and master zone for each of the realms`
5656
};
5757

5858
@BlockUI()
@@ -210,7 +210,7 @@ export class RgwMultisiteDetailsComponent implements OnDestroy, OnInit {
210210
const createZonegroupAction: CdTableAction = {
211211
permission: 'create',
212212
icon: Icons.add,
213-
name: this.actionLabels.CREATE + ' Zonegroup',
213+
name: this.actionLabels.CREATE + ' Zone Group',
214214
click: () => this.openModal('zonegroup'),
215215
disable: () => this.getDisable()
216216
};

‎src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-export/rgw-multisite-export.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<cd-modal [modalRef]="activeModal">
22
<ng-container i18n="form title"
3-
class="modal-title">Export Multi-site Realm Token</ng-container>
3+
class="modal-title">Export Multi-Site Realm Token</ng-container>
44

55
<ng-container class="modal-content">
66
<form name="exportTokenForm"

‎src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-import/rgw-multisite-import.component.html‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
<cd-modal [modalRef]="activeModal">
22
<ng-container i18n="form title"
3-
class="modal-title">Import Multi-site Token</ng-container>
3+
class="modal-title">Import Multi-Site Token</ng-container>
44

55
<ng-container class="modal-content">
66
<form name="importTokenForm"
77
#frm="ngForm"
88
[formGroup]="importTokenForm">
99
<div class="modal-body">
1010
<cd-alert-panel type="info"
11-
spacingClass="mb-3">Please create a rgw service using the secondary zone(created after submitting this form) to start the replication between zones.
11+
spacingClass="mb-3">
12+
<ul>
13+
<li>This feature allows you to configure a connection between your primary and secondary Ceph clusters for data replication. By importing a token, you establish a link between the clusters, enabling data synchronization.</li>
14+
<li>To obtain the token, generate it from your secondary Ceph cluster. This token includes encoded information about the secondary cluster's endpoint, access key, and secret key.</li>
15+
<li>The secondary zone represents the destination cluster where your data will be replicated.</li>
16+
<li>Please create an RGW service using the secondary zone (created after submitting this form) to start the replication between zones.</li>
17+
</ul>
1218
</cd-alert-panel>
1319
<div class="form-group row">
1420
<label class="cd-col-form-label required"

‎src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-migrate/rgw-multisite-migrate.component.html‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<cd-modal [modalRef]="activeModal">
22
<ng-container i18n="form title"
3-
class="modal-title">Migrate Single Site to Multi-site
3+
class="modal-title">Migrate Single Site to Multi-Site
44
<cd-helper>
5-
<span>Migrate from a single-site deployment with a default zonegroup and zone to a multi-site system</span>
5+
<span>Migrate from a single-site deployment with a default zone group and zone to a multi-site system</span>
66
</cd-helper>
77
</ng-container>
88

@@ -34,11 +34,11 @@
3434
<div class="form-group row">
3535
<label class="cd-col-form-label required"
3636
for="zonegroupName"
37-
i18n>Rename default zonegroup</label>
37+
i18n>Rename default zone group</label>
3838
<div class="cd-col-form-input">
3939
<input class="form-control"
4040
type="text"
41-
placeholder="Zonegroup name..."
41+
placeholder="Zone group name..."
4242
id="zonegroupName"
4343
name="zonegroupName"
4444
formControlName="zonegroupName">
@@ -47,13 +47,14 @@
4747
i18n>This field is required.</span>
4848
<span class="invalid-feedback"
4949
*ngIf="multisiteMigrateForm.showError('zonegroupName', formDir, 'uniqueName')"
50-
i18n>The chosen zonegroup name is already in use.</span>
50+
i18n>The chosen zone group name is already in use.</span>
5151
</div>
5252
</div>
5353
<div class="form-group row">
5454
<label class="cd-col-form-label required"
5555
for="zonegroup_endpoints"
56-
i18n>Zonegroup Endpoints</label>
56+
i18n>Zone group Endpoints
57+
</label>
5758
<div class="cd-col-form-input">
5859
<input class="form-control"
5960
type="text"
@@ -91,7 +92,8 @@
9192
<div class="form-group row">
9293
<label class="cd-col-form-label required"
9394
for="zone_endpoints"
94-
i18n>Zone Endpoints</label>
95+
i18n>Zone Endpoints
96+
</label>
9597
<div class="cd-col-form-input">
9698
<input class="form-control"
9799
type="text"
@@ -110,7 +112,11 @@
110112
<div class="form-group row">
111113
<label class="cd-col-form-label required"
112114
for="access_key"
113-
i18n>Access key</label>
115+
i18n>S3 access key
116+
<cd-helper>
117+
<span>To see or copy your S3 access key, go to <b>Object Gateway > Users</b> and click on your user name. In <b>Keys</b>, click <b>Show</b>. View the access key by clicking Show and copy the key by clicking <b>Copy to Clipboard</b>.</span>
118+
</cd-helper>
119+
</label>
114120
<div class="cd-col-form-input">
115121
<input class="form-control"
116122
type="text"
@@ -123,7 +129,11 @@
123129
<div class="form-group row">
124130
<label class="cd-col-form-label required"
125131
for="access_key"
126-
i18n>Secret key</label>
132+
i18n>S3 secret key
133+
<cd-helper>
134+
<span>To see or copy your S3 access key, go to <b>Object Gateway > Users</b> and click on your user name. In <b>Keys</b>, click <b>Show</b>. View the secret key by clicking Show and copy the key by clicking <b>Copy to Clipboard</b>.</span>
135+
</cd-helper>
136+
</label>
127137
<div class="cd-col-form-input">
128138
<input class="form-control"
129139
type="text"

‎src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zone-form/rgw-multisite-zone-form.component.html‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div class="form-group row">
1212
<label class="cd-col-form-label"
1313
for="selectedZonegroup"
14-
i18n>Select Zonegroup</label>
14+
i18n>Select Zone Group</label>
1515
<div class="cd-col-form-input">
1616
<select class="form-select"
1717
id="selectedZonegroup"
@@ -55,7 +55,7 @@
5555
for="default_zone"
5656
i18n>Default</label>
5757
<span *ngIf="disableDefault && action === 'create'">
58-
<cd-helper i18n>Default zone can only exist in a default zonegroup.
58+
<cd-helper i18n>Default zone can only exist in a default zone group.
5959
</cd-helper>
6060
</span>
6161
<span *ngIf="isDefaultZone">
@@ -77,7 +77,7 @@
7777
for="master_zone"
7878
i18n>Master</label>
7979
<span *ngIf="disableMaster">
80-
<cd-helper i18n>Master zone already exists for the selected zonegroup.
80+
<cd-helper i18n>Master zone already exists for the selected zone group.
8181
</cd-helper>
8282
</span>
8383
<span *ngIf="isMasterZone">
@@ -112,7 +112,11 @@
112112
<div class="form-group row">
113113
<label class="cd-col-form-label required"
114114
for="access_key"
115-
i18n>Access key</label>
115+
i18n>S3 access key
116+
<cd-helper>
117+
<span>To see or copy your S3 access key, go to <b>Object Gateway > Users</b> and click on your user name. In <b>Keys</b>, click <b>Show</b>. View the access key by clicking Show and copy the key by clicking <b>Copy to Clipboard</b>.</span>
118+
</cd-helper>
119+
</label>
116120
<div class="cd-col-form-input">
117121
<input class="form-control"
118122
type="text"
@@ -125,7 +129,11 @@
125129
<div class="form-group row">
126130
<label class="cd-col-form-label required"
127131
for="access_key"
128-
i18n>Secret key</label>
132+
i18n>S3 secret key
133+
<cd-helper>
134+
<span>To see or copy your S3 access key, go to <b>Object Gateway > Users</b> and click on your user name. In <b>Keys</b>, click <b>Show</b>. View the secret key by clicking Show and copy the key by clicking <b>Copy to Clipboard</b>.</span>
135+
</cd-helper>
136+
</label>
129137
<div class="cd-col-form-input">
130138
<input class="form-control"
131139
type="text"

‎src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-zonegroup-form/rgw-multisite-zonegroup-form.component.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<cd-modal [modalRef]="activeModal">
22
<ng-container i18n="form title"
3-
class="modal-title">{{ action | titlecase }} {{ resource | upperFirst }}</ng-container>
3+
class="modal-title">{{ action | titlecase }} Zone Group</ng-container>
44

55
<ng-container class="modal-content">
66
<form name="multisiteZonegroupForm"
@@ -30,11 +30,11 @@
3030
<div class="form-group row">
3131
<label class="cd-col-form-label required"
3232
for="zonegroupName"
33-
i18n>Zonegroup Name</label>
33+
i18n>Zone Group Name</label>
3434
<div class="cd-col-form-input">
3535
<input class="form-control"
3636
type="text"
37-
placeholder="Zonegroup name..."
37+
placeholder="Zone group name..."
3838
id="zonegroupName"
3939
name="zonegroupName"
4040
formControlName="zonegroupName">
@@ -43,7 +43,7 @@
4343
i18n>This field is required.</span>
4444
<span class="invalid-feedback"
4545
*ngIf="multisiteZonegroupForm.showError('zonegroupName', formDir, 'uniqueName')"
46-
i18n>The chosen zonegroup name is already in use.</span>
46+
i18n>The chosen zone group name is already in use.</span>
4747
<div class="custom-control custom-checkbox">
4848
<input class="form-check-input"
4949
id="default_zonegroup"
@@ -55,7 +55,7 @@
5555
for="default_zonegroup"
5656
i18n>Default</label>
5757
<span *ngIf="disableDefault && action === 'create'">
58-
<cd-helper i18n>Zonegroup doesn't belong to the default realm.</cd-helper>
58+
<cd-helper i18n>Zone group doesn't belong to the default realm.</cd-helper>
5959
</span>
6060
<cd-helper *ngIf="action === 'edit' && !info.data.is_default">
6161
<span i18n>Please consult the <a href="{{ docUrl }}">documentation</a> to follow the failover mechanism</span>
@@ -73,7 +73,7 @@
7373
for="master_zonegroup"
7474
i18n>Master</label>
7575
<span *ngIf="disableMaster && action === 'create'">
76-
<cd-helper i18n>Multiple master zonegroups can't be configured. If you want to create a new zonegroup and make it the master zonegroup, you must delete the default zonegroup.</cd-helper>
76+
<cd-helper i18n>Multiple master zone groups can't be configured. If you want to create a new zone group and make it the master zone group, you must delete the default zone group.</cd-helper>
7777
</span>
7878
<cd-helper *ngIf="action === 'edit' && !info.data.is_master">
7979
<span i18n>Please consult the <a href="{{ docUrl }}">documentation</a> to follow the failover mechanism</span>
@@ -198,7 +198,7 @@
198198
<div class="modal-footer">
199199
<cd-form-button-panel (submitActionEvent)="submit()"
200200
[form]="multisiteZonegroupForm"
201-
[submitText]="(action | titlecase) + ' ' + (resource | upperFirst)"></cd-form-button-panel>
201+
[submitText]="(action | titlecase) + ' ' + 'Zone Group'"></cd-form-button-panel>
202202
</div>
203203
</form>
204204
</ng-container>

0 commit comments

Comments
 (0)