From 5fd8ef9767f1069832408f3be46d53da0fa1f766 Mon Sep 17 00:00:00 2001 From: Ryan Moe Date: Thu, 31 Oct 2013 15:51:33 -0700 Subject: [PATCH] Don't label or format disks for Ceph OSDs Along with the changes from this https://github.com/Mirantis/fuel/pull/773 we no longer need to label Ceph disks. This removes superflous mkfs calls during post-intallation and works around issues in ceph-deploy and ceph-disk. Closes-Bug: #1246513 Change-Id: I91e6c253c164936c8b12798520cbd45587a36036 --- nailgun/nailgun/fixtures/openstack.json | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/nailgun/nailgun/fixtures/openstack.json b/nailgun/nailgun/fixtures/openstack.json index c0153e525b..4438456f14 100644 --- a/nailgun/nailgun/fixtures/openstack.json +++ b/nailgun/nailgun/fixtures/openstack.json @@ -155,9 +155,8 @@ "label": "Ceph", "name": "Ceph", "mount": "none", - "disk_label": "cephosd", "partition_guid": "4fbd7e29-9d25-41b8-afd0-062c0ceff05d", - "file_system": "xfs" + "file_system": "none" }, { "id": "cephjournal", @@ -166,9 +165,8 @@ "name": "Ceph Journal", "label": "Ceph Journal", "mount": "none", - "disk_label": "cephjournal", "partition_guid": "45b0969e-9b03-4f30-b4c6-b4b80ceff106", - "file_system": "ext4" + "file_system": "none" }, { "id": "os", @@ -1102,9 +1100,8 @@ "label": "Ceph", "name": "Ceph", "mount": "none", - "disk_label": "cephosd", "partition_guid": "4fbd7e29-9d25-41b8-afd0-062c0ceff05d", - "file_system": "xfs" + "file_system": "none" }, { "id": "cephjournal", @@ -1113,9 +1110,8 @@ "name": "Ceph Journal", "label": "Ceph Journal", "mount": "none", - "disk_label": "cephjournal", "partition_guid": "45b0969e-9b03-4f30-b4c6-b4b80ceff106", - "file_system": "ext4" + "file_system": "none" }, { "id": "os",