update ceph source to reef 18.1.2

[ceph.git] / ceph / src / pybind / mgr / dashboard / frontend / src / app / ceph / rgw / rgw-config-modal / rgw-config-modal.component.html

diff --git a/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.html b/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.html
index dbf93f4de3f971daf9a781cbd6b4be29abbd6c23..a8ed17838347630500ea72fa2a9f22c2332220cf 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.html
+++ b/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.html
@@ -69,9 +69,6 @@
                     name="auth_method"
                     class="form-select"
                     formControlName="auth_method">
-              <option i18n
-                      *ngIf="authMethods !== null"
-                      [ngValue]="null">-- Select a method --</option>
               <option *ngFor="let auth_method of authMethods"
                       [value]="auth_method">{{ auth_method }}</option>
             </select>
@@ -92,9 +89,6 @@
                     name="secret_engine"
                     class="form-select"
                     formControlName="secret_engine">
-              <option i18n
-                      *ngIf="secretEngines !== null"
-                      [ngValue]="null">-- Select a method --</option>
               <option *ngFor="let secret_engine of secretEngines"
                       [value]="secret_engine">{{ secret_engine }}</option>
             </select>
@@ -150,7 +144,8 @@
             <input id="address"
                    name="address"
                    class="form-control"
-                   formControlName="address">
+                   formControlName="address"
+                   placeholder="http://127.0.0.1:8000">
             <span class="invalid-feedback"
                   *ngIf="configForm.showError('address', frm, 'required')"
                   i18n>This field is required.</span>
@@ -163,6 +158,9 @@
         <label class="cd-col-form-label required"
                for="token">
         <span i18n>Token</span>
+        <cd-helper i18n>
+          The token authentication method expects a Vault token to be present in a plaintext file.
+        </cd-helper>
         </label>
         <div class="cd-col-form-input">
           <input type="file"