From bc70d016f61db3a1bf2c82bd0da58844365d6b6a Mon Sep 17 00:00:00 2001 From: wangwei Date: Mon, 27 Aug 2018 16:00:42 +0900 Subject: [PATCH] Fix bluestore disk naming format in kolla-ansible The current bluestore disk label naming is inconsistent with the filestore. The filestore naming format is that the disk prefixes belonging to the same osd are the same and the suffixes are different. This patch keeps the bluestore's disk naming as well. Change-Id: I71dda29fc4a6765300ce7bb173d2c448c24f6eca (cherry picked from commit 4e5e28fff53abf526042c965f6770c28c7c37742) --- ansible/roles/ceph/defaults/main.yml | 2 +- doc/source/reference/ceph-guide.rst | 6 +++--- tests/setup_ceph_disks.sh | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ansible/roles/ceph/defaults/main.yml b/ansible/roles/ceph/defaults/main.yml index 34563286c0..56817ab3ae 100644 --- a/ansible/roles/ceph/defaults/main.yml +++ b/ansible/roles/ceph/defaults/main.yml @@ -58,7 +58,7 @@ ceph_client_mds_keyring_caps: partition_name_osd_bootstrap: "{{ 'KOLLA_CEPH_OSD_BOOTSTRAP_BS' if ceph_osd_store_type == 'bluestore' else 'KOLLA_CEPH_OSD_BOOTSTRAP' }}" partition_name_cache_bootstrap: "{{ 'KOLLA_CEPH_OSD_CACHE_BOOTSTRAP_BS' if ceph_osd_store_type == 'bluestore' else 'KOLLA_CEPH_OSD_CACHE_BOOTSTRAP' }}" -partition_name_osd_data: "{{ 'KOLLA_CEPH_BSDATA' if ceph_osd_store_type == 'bluestore' else 'KOLLA_CEPH_DATA' }}" +partition_name_osd_data: "{{ 'KOLLA_CEPH_DATA_BS' if ceph_osd_store_type == 'bluestore' else 'KOLLA_CEPH_DATA' }}" #################### ## Ceph_rgw_keystone diff --git a/doc/source/reference/ceph-guide.rst b/doc/source/reference/ceph-guide.rst index 8564314206..694ebe6812 100644 --- a/doc/source/reference/ceph-guide.rst +++ b/doc/source/reference/ceph-guide.rst @@ -72,7 +72,7 @@ To prepare a bluestore OSD block partition, execute the following operations: .. code-block:: console - parted $DISK -s -- mklabel gpt mkpart KOLLA_CEPH_OSD_BOOTSTRAP_BS_B 1 -1 + parted $DISK -s -- mklabel gpt mkpart KOLLA_CEPH_OSD_BOOTSTRAP_BS_FOO_B 1 -1 .. end @@ -81,7 +81,7 @@ operations: .. code-block:: console - parted $DISK -s -- mklabel gpt mkpart KOLLA_CEPH_OSD_BOOTSTRAP_BS_W 1 -1 + parted $DISK -s -- mklabel gpt mkpart KOLLA_CEPH_OSD_BOOTSTRAP_BS_FOO_W 1 -1 .. end @@ -90,7 +90,7 @@ operations: .. code-block:: console - parted $DISK -s -- mklabel gpt mkpart KOLLA_CEPH_OSD_BOOTSTRAP_BS_D 1 -1 + parted $DISK -s -- mklabel gpt mkpart KOLLA_CEPH_OSD_BOOTSTRAP_BS_FOO_D 1 -1 .. end diff --git a/tests/setup_ceph_disks.sh b/tests/setup_ceph_disks.sh index 582894b8b4..214e5e3532 100644 --- a/tests/setup_ceph_disks.sh +++ b/tests/setup_ceph_disks.sh @@ -7,17 +7,17 @@ parted $LOOP -s -- mklabel gpt mkpart KOLLA_CEPH_OSD_BOOTSTRAP_BS_OSD1 1 -1 dd if=/dev/zero of=/opt/data/kolla/ceph-osd0-b.img bs=5M count=2048 LOOP=$(losetup -f) losetup $LOOP /opt/data/kolla/ceph-osd0-b.img -parted $LOOP -s -- mklabel gpt mkpart KOLLA_CEPH_OSD_BOOTSTRAP_BS_B_OSD1 1 -1 +parted $LOOP -s -- mklabel gpt mkpart KOLLA_CEPH_OSD_BOOTSTRAP_BS_OSD1_B 1 -1 dd if=/dev/zero of=/opt/data/kolla/ceph-osd0-w.img bs=5M count=256 LOOP=$(losetup -f) losetup $LOOP /opt/data/kolla/ceph-osd0-w.img -parted $LOOP -s -- mklabel gpt mkpart KOLLA_CEPH_OSD_BOOTSTRAP_BS_W_OSD1 1 -1 +parted $LOOP -s -- mklabel gpt mkpart KOLLA_CEPH_OSD_BOOTSTRAP_BS_OSD1_W 1 -1 dd if=/dev/zero of=/opt/data/kolla/ceph-osd0-d.img bs=5M count=256 LOOP=$(losetup -f) losetup $LOOP /opt/data/kolla/ceph-osd0-d.img -parted $LOOP -s -- mklabel gpt mkpart KOLLA_CEPH_OSD_BOOTSTRAP_BS_D_OSD1 1 -1 +parted $LOOP -s -- mklabel gpt mkpart KOLLA_CEPH_OSD_BOOTSTRAP_BS_OSD1_D 1 -1 partprobe