From ac41fb5961e500f65a2e7c19b998374a9773f896 Mon Sep 17 00:00:00 2001 From: Chinasubbareddy M Date: Mon, 7 Jan 2019 13:27:50 -0600 Subject: [PATCH] Ceph journal partitions automation - Use whole disk /dev/sdc format. - Don't specify partition and let ceph-osd util create and manage partition. - On an OSD disk failure, during manintanance window, Journal partition for failed OSD should be deleted. This will allow ceph-osd util to reuse space for new partition. - Disk partition count num will continue to increase as more OSD fails. Change-Id: I6900898fb90bcbb1743cd6382c176ad24b6624d7 --- .../profiles/host/cp_r720.yaml | 42 ------------------- .../profiles/host/dp_r720.yaml | 13 ------ .../osh/openstack-tenant-ceph/ceph-osd.yaml | 8 ++-- .../software/charts/ucp/ceph/ceph-osd.yaml | 16 +++---- site/airskiff/profiles/host/cp_r720.yaml | 40 ------------------ site/airskiff/profiles/host/dp_r720.yaml | 12 ------ .../software/charts/ucp/ceph/ceph-osd.yaml | 16 +++---- 7 files changed, 20 insertions(+), 127 deletions(-) diff --git a/site/airship-seaworthy/profiles/host/cp_r720.yaml b/site/airship-seaworthy/profiles/host/cp_r720.yaml index aa6028713..38838904c 100644 --- a/site/airship-seaworthy/profiles/host/cp_r720.yaml +++ b/site/airship-seaworthy/profiles/host/cp_r720.yaml @@ -76,27 +76,6 @@ data: fstype: 'ext4' mount_options: 'defaults' - cephjournal1: - partitions: - - name: 'ceph-j1' - size: '10g' - - name: 'ceph-j2' - size: '10g' - - name: 'ceph-j3' - size: '10g' - - name: 'ceph-j4' - size: '10g' - cephjournal2: - partitions: - - name: 'ceph-j5' - size: '10g' - - name: 'ceph-j6' - size: '10g' - - name: 'ceph-j7' - size: '10g' - - name: 'ceph-j8' - size: '10g' - platform: kernel: 'hwe-16.04' kernel_params: @@ -182,27 +161,6 @@ data: fstype: 'ext4' mount_options: 'defaults' - cephjournal1: - partitions: - - name: 'ceph-j1' - size: '10g' - - name: 'ceph-j2' - size: '10g' - - name: 'ceph-j3' - size: '10g' - - name: 'ceph-j4' - size: '10g' - cephjournal2: - partitions: - - name: 'ceph-j5' - size: '10g' - - name: 'ceph-j6' - size: '10g' - - name: 'ceph-j7' - size: '10g' - - name: 'ceph-j8' - size: '10g' - platform: kernel: 'hwe-16.04' kernel_params: diff --git a/site/airship-seaworthy/profiles/host/dp_r720.yaml b/site/airship-seaworthy/profiles/host/dp_r720.yaml index d68657156..71587684c 100644 --- a/site/airship-seaworthy/profiles/host/dp_r720.yaml +++ b/site/airship-seaworthy/profiles/host/dp_r720.yaml @@ -75,19 +75,6 @@ data: fstype: 'ext4' mount_options: 'defaults' - cephjournal1: - partitions: - - name: 'ceph-j1' - size: '10g' - - name: 'ceph-j2' - size: '10g' - cephjournal2: - partitions: - - name: 'ceph-j3' - size: '10g' - - name: 'ceph-j4' - size: '10g' - ephemeral: partitions: - name: 'nova' diff --git a/site/airship-seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml b/site/airship-seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml index 051dd178a..6bcb77082 100644 --- a/site/airship-seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml +++ b/site/airship-seaworthy/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml @@ -33,23 +33,23 @@ data: location: /dev/sde journal: type: block-logical - location: /dev/sdb1 + location: /dev/sdb - data: type: block-logical location: /dev/sdf journal: type: block-logical - location: /dev/sdb2 + location: /dev/sdb - data: type: block-logical location: /dev/sdg journal: type: block-logical - location: /dev/sdc1 + location: /dev/sdc - data: type: block-logical location: /dev/sdh journal: type: block-logical - location: /dev/sdc2 + location: /dev/sdc ... diff --git a/site/airship-seaworthy/software/charts/ucp/ceph/ceph-osd.yaml b/site/airship-seaworthy/software/charts/ucp/ceph/ceph-osd.yaml index 927521c9d..38c0149bb 100644 --- a/site/airship-seaworthy/software/charts/ucp/ceph/ceph-osd.yaml +++ b/site/airship-seaworthy/software/charts/ucp/ceph/ceph-osd.yaml @@ -29,47 +29,47 @@ data: location: /dev/sdd journal: type: block-logical - location: /dev/sdb1 + location: /dev/sdb - data: type: block-logical location: /dev/sde journal: type: block-logical - location: /dev/sdb2 + location: /dev/sdb - data: type: block-logical location: /dev/sdf journal: type: block-logical - location: /dev/sdb3 + location: /dev/sdb - data: type: block-logical location: /dev/sdg journal: type: block-logical - location: /dev/sdb4 + location: /dev/sdb - data: type: block-logical location: /dev/sdh journal: type: block-logical - location: /dev/sdc1 + location: /dev/sdc - data: type: block-logical location: /dev/sdi journal: type: block-logical - location: /dev/sdc2 + location: /dev/sdc - data: type: block-logical location: /dev/sdj journal: type: block-logical - location: /dev/sdc3 + location: /dev/sdc - data: type: block-logical location: /dev/sdk journal: type: block-logical - location: /dev/sdc4 + location: /dev/sdc ... diff --git a/site/airskiff/profiles/host/cp_r720.yaml b/site/airskiff/profiles/host/cp_r720.yaml index d61ba2a9c..283bb8393 100644 --- a/site/airskiff/profiles/host/cp_r720.yaml +++ b/site/airskiff/profiles/host/cp_r720.yaml @@ -78,26 +78,6 @@ data: fstype: 'ext4' mount_options: 'defaults' - cephjournal1: - partitions: - - name: 'ceph-j1' - size: '10g' - - name: 'ceph-j2' - size: '10g' - - name: 'ceph-j3' - size: '10g' - - name: 'ceph-j4' - size: '10g' - cephjournal2: - partitions: - - name: 'ceph-j5' - size: '10g' - - name: 'ceph-j6' - size: '10g' - - name: 'ceph-j7' - size: '10g' - - name: 'ceph-j8' - size: '10g' platform: kernel: 'hwe-16.04' @@ -184,26 +164,6 @@ data: fstype: 'ext4' mount_options: 'defaults' - cephjournal1: - partitions: - - name: 'ceph-j1' - size: '10g' - - name: 'ceph-j2' - size: '10g' - - name: 'ceph-j3' - size: '10g' - - name: 'ceph-j4' - size: '10g' - cephjournal2: - partitions: - - name: 'ceph-j5' - size: '10g' - - name: 'ceph-j6' - size: '10g' - - name: 'ceph-j7' - size: '10g' - - name: 'ceph-j8' - size: '10g' platform: kernel: 'hwe-16.04' diff --git a/site/airskiff/profiles/host/dp_r720.yaml b/site/airskiff/profiles/host/dp_r720.yaml index 3393cedec..1e4c5c46f 100644 --- a/site/airskiff/profiles/host/dp_r720.yaml +++ b/site/airskiff/profiles/host/dp_r720.yaml @@ -77,18 +77,6 @@ data: fstype: 'ext4' mount_options: 'defaults' - cephjournal1: - partitions: - - name: 'ceph-j1' - size: '10g' - - name: 'ceph-j2' - size: '10g' - cephjournal2: - partitions: - - name: 'ceph-j3' - size: '10g' - - name: 'ceph-j4' - size: '10g' ephemeral: partitions: diff --git a/site/airskiff/software/charts/ucp/ceph/ceph-osd.yaml b/site/airskiff/software/charts/ucp/ceph/ceph-osd.yaml index f2a82b1b5..8abd4ebcf 100644 --- a/site/airskiff/software/charts/ucp/ceph/ceph-osd.yaml +++ b/site/airskiff/software/charts/ucp/ceph/ceph-osd.yaml @@ -31,47 +31,47 @@ data: location: /dev/sdd journal: type: block-logical - location: /dev/sdb1 + location: /dev/sdb - data: type: block-logical location: /dev/sde journal: type: block-logical - location: /dev/sdb2 + location: /dev/sdb - data: type: block-logical location: /dev/sdf journal: type: block-logical - location: /dev/sdb3 + location: /dev/sdb - data: type: block-logical location: /dev/sdg journal: type: block-logical - location: /dev/sdb4 + location: /dev/sdb - data: type: block-logical location: /dev/sdh journal: type: block-logical - location: /dev/sdc1 + location: /dev/sdc - data: type: block-logical location: /dev/sdi journal: type: block-logical - location: /dev/sdc2 + location: /dev/sdc - data: type: block-logical location: /dev/sdj journal: type: block-logical - location: /dev/sdc3 + location: /dev/sdc - data: type: block-logical location: /dev/sdk journal: type: block-logical - location: /dev/sdc4 + location: /dev/sdc ...