import 15.2.5

[ceph.git] / ceph / src / pybind / mgr / dashboard / frontend / src / app / shared / api / osd.service.ts

diff --git a/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.ts b/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.ts
index 8d6369a21623317288a1ca908f2216412292543e..0bd2f370a9b1f6b6633b5a8a2d6b8682c0ceeb7c 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.ts
+++ b/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpParams } from '@angular/common/http';
+import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 
 import { I18n } from '@ngx-translate/i18n-polyfill';
@@ -137,10 +137,12 @@ export class OsdService {
     return this.http.post(`${this.path}/${id}/destroy`, null);
   }
 
-  delete(id: number, force?: boolean) {
-    const options = force ? { params: new HttpParams().set('force', 'true') } : {};
-    options['observe'] = 'response';
-    return this.http.delete(`${this.path}/${id}`, options);
+  delete(id: number, preserveId?: boolean, force?: boolean) {
+    const params = {
+      preserve_id: preserveId ? 'true' : 'false',
+      force: force ? 'true' : 'false'
+    };
+    return this.http.delete(`${this.path}/${id}`, { observe: 'response', params: params });
   }
 
   safeToDestroy(ids: string) {