try to get ceph layout pools with ceph.client.samba.keyring first

45Drives · Jun 27, 2022 · 5c6ee93 · 5c6ee93
1 parent e8a8ab8
commit 5c6ee93
Showing 1 changed file with 69 additions and 17 deletions.
diff --git a/file-sharing/src/components/SambaManager.vue b/file-sharing/src/components/SambaManager.vue
@@ -16,28 +16,61 @@ If not, see <https://www.gnu.org/licenses/>.
 -->
 
 <template>
-	<div class="centered-column p-well space-y-well" :class="{'cursor-wait': processing}">
-		<SambaGlobalManagement :globalConfig="globalConfig" :processing="processing" @startProcessing="processing++"
-			@stopProcessing="processing--" />
-		<SambaShareManagement :shares="shares" @refreshShares="refresh" :groups="groups" :users="users"
-			:cephLayoutPools="cephLayoutPools" :ctdbHosts="ctdbHosts" :parentProcessing="processing"
+	<div
+		class="centered-column p-well space-y-well"
+		:class="{ 'cursor-wait': processing }"
+	>
+		<SambaGlobalManagement
+			:globalConfig="globalConfig"
+			:processing="processing"
+			@startProcessing="processing++"
+			@stopProcessing="processing--"
+		/>
+		<SambaShareManagement
+			:shares="shares"
+			@refreshShares="refresh"
+			:groups="groups"
+			:users="users"
+			:cephLayoutPools="cephLayoutPools"
+			:ctdbHosts="ctdbHosts"
+			:parentProcessing="processing"
 			@appendShareToList="share => shares = [...shares, share].sort((a, b) => a.name.localeCompare(b.name))"
-			@removeShareFromList="share => shares = shares.filter((a) => a !== share)" />
+			@removeShareFromList="share => shares = shares.filter((a) => a !== share)"
+		/>
 		<div class="card">
 			<div class="card-header flex flex-row space-x-2 items-center">
 				<div class="text-header">Import/Export Config</div>
-				<LoadingSpinner v-if="processing" class="size-icon" />
+				<LoadingSpinner
+					v-if="processing"
+					class="size-icon"
+				/>
 			</div>
 			<div class="card-body button-group-row">
-				<input @change="importConfig" type="file" id="file-upload" hidden />
-				<button @click="uploadConfig" class="btn btn-primary">Import</button>
-				<button @click="exportConfig" class="btn btn-primary">Export</button>
+				<input
+					@change="importConfig"
+					type="file"
+					id="file-upload"
+					hidden
+				/>
+				<button
+					@click="uploadConfig"
+					class="btn btn-primary"
+				>Import</button>
+				<button
+					@click="exportConfig"
+					class="btn btn-primary"
+				>Export</button>
 			</div>
 		</div>
 	</div>
-	<ModalPopup :showModal="confirmationModal.showModal" @apply="confirmationModal.applyCallback"
-		@cancel="confirmationModal.cancelCallback" applyDangerous applyText="Yes"
-		:headerText="confirmationModal.headerText">
+	<ModalPopup
+		:showModal="confirmationModal.showModal"
+		@apply="confirmationModal.applyCallback"
+		@cancel="confirmationModal.cancelCallback"
+		applyDangerous
+		applyText="Yes"
+		:headerText="confirmationModal.headerText"
+	>
 		<template #icon>
 			<ExclamationCircleIcon class="size-icon-xl icon-danger shrink-0" />
 		</template>
@@ -213,9 +246,28 @@ export default {
 
 		const getCephLayoutPools = async () => {
 			try {
-				const cephFsStatus = JSON.parse((await useSpawn(['ceph', 'fs', 'status', '--format=json'], { superuser: 'try' }).promise()).stdout);
-				cephLayoutPools.value = cephFsStatus.pools.filter(pool => pool.type === 'data').map(pool => pool.name);
-			} catch (state) { /* not ceph */ }
+				const cephFsStatus = JSON.parse((await useSpawn([
+					'ceph',
+					'fs',
+					'status',
+					'--keyring=/etc/ceph/ceph.client.samba.keyring',
+					'-n',
+					'client.samba',
+					'--format=json',
+				], { superuser: 'try' }).promise()).stdout);
+				cephLayoutPools.value = cephFsStatus.pools
+					.filter(pool => pool.type === 'data')
+					.map(pool => pool.name);
+			} catch {
+				try {
+					const cephFsStatus = JSON.parse((await useSpawn([
+						'ceph', 'fs', 'status', '--format=json'
+					], { superuser: 'try' }).promise()).stdout);
+					cephLayoutPools.value = cephFsStatus.pools
+						.filter(pool => pool.type === 'data')
+						.map(pool => pool.name);
+				} catch { /* assuming not ceph */ }
+			}
 		}
 
 		const refresh = async () => {
@@ -290,7 +342,7 @@ export default {
 		watchHandles.push(cockpit.file('/etc/group', { superuser: 'try' }).watch(() => getGroupList(), { read: false }));
 		watchHandles.push(cockpit.file('/etc/passwd', { superuser: 'try' }).watch(() => getUserList(), { read: false }));
 		watchHandles.push(cockpit.file('/etc/ctdb/nodes', { superuser: 'try' }).watch(() => getCtdbHosts(), { read: false }));
-		
+
 		onBeforeUnmount(() => watchHandles.map(handle => handle?.remove?.()));
 
 		return {