From b817404aed59d0984c4d7d1f280ecd9750c741e4 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 28 Dec 2018 21:45:56 +0000 Subject: [PATCH] Fix minor typo in ceph-disk params. Change-Id: I39c6f52c11d37e180c60ee009e2b7a50f553f9e1 --- manifests/osd.pp | 4 ++-- spec/defines/ceph_osd_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/osd.pp b/manifests/osd.pp index 73ea090e..e10e9e01 100644 --- a/manifests/osd.pp +++ b/manifests/osd.pp @@ -89,10 +89,10 @@ define ceph::osd ( if ($bluestore_wal) or ($bluestore_db) { if $bluestore_wal { - $wal_opts = "--block-wal $(readlink -f ${bluestore_wal})" + $wal_opts = "--block.wal $(readlink -f ${bluestore_wal})" } if $bluestore_db { - $block_opts = "--block-db $(readlink -f ${bluestore_db})" + $block_opts = "--block.db $(readlink -f ${bluestore_db})" } $journal_opts = "${wal_opts} ${block_opts}" diff --git a/spec/defines/ceph_osd_spec.rb b/spec/defines/ceph_osd_spec.rb index 8bfe5bb9..778e84c2 100644 --- a/spec/defines/ceph_osd_spec.rb +++ b/spec/defines/ceph_osd_spec.rb @@ -140,7 +140,7 @@ if ! test -b $disk ; then chown -h ceph:ceph $disk fi fi -ceph-disk prepare --bluestore --cluster testcluster --cluster-uuid f39ace04-f967-4c3d-9fd2-32af2d2d2cd5 $(readlink -f /srv/data) --block-wal $(readlink -f /srv/wal) --block-db $(readlink -f /srv/db) +ceph-disk prepare --bluestore --cluster testcluster --cluster-uuid f39ace04-f967-4c3d-9fd2-32af2d2d2cd5 $(readlink -f /srv/data) --block.wal $(readlink -f /srv/wal) --block.db $(readlink -f /srv/db) udevadm settle ", 'unless' => "/bin/true # comment to satisfy puppet syntax requirements