diff --git a/bak.ceph.conf b/bak.ceph.conf deleted file mode 100644 index c2d8ad3..0000000 --- a/bak.ceph.conf +++ /dev/null @@ -1,35 +0,0 @@ -[global] -fsid = 29ef4020-303a-4b2e-aa24-a1e20e5ba21c -#ms_bind_ipv6 = true -mon_initial_members = pine01, pine02 -mon_host = [v2:192.168.10.160:3300,v1:192.168.10.160:6789], [v2:192.168.10.161:3300,v1:192.168.10.161:6789] -auth_cluster_required = cephx -auth_service_required = cephx -auth_client_required = cephx -public network = 192.168.10.0/24 -cluster network = 10.255.255.0/27 -osd pool default pg num = 8 -osd pool default pgp num = 8 -osd pool default size = 2 # Write an object 3 times. -osd pool default min size = 1 # Allow writing two copies in a degraded state. -osd max backfills = 1 -#50mb / 5mb / 64mb -osd_memory_target = 536870912 #512Mb -bluestore_cache_autotune = false -bluestore_cache_size = 52428800 -bluestore_cache_size_hdd = 5242880 -bluestore_cache_size_ssd = 5242880 -bluestore_cache_kv_max = 67108864 - - -#[mon.pine01] -# host = pine01 -# address = 192.168.10.160:6789 -# -#[mon.pine02] -# host = pine02 -# address = 192.168.10.161:6789 -# -#[mon.riot01] -# host = riot01 -# address = 192.168.10.164:6789 diff --git a/ceph.bootstrap-mds.keyring b/ceph.bootstrap-mds.keyring index 74b1f53..313ab84 100644 --- a/ceph.bootstrap-mds.keyring +++ b/ceph.bootstrap-mds.keyring @@ -1,3 +1,3 @@ [client.bootstrap-mds] - key = AQACjG9ezu7qHRAA4x8O0LWW/Iv1kk3LcxsSUw== + key = AQBEUXJewHz8IhAAwimqlg5sf0JjRZB2QtLjYA== caps mon = "allow profile bootstrap-mds" diff --git a/ceph.bootstrap-mgr.keyring b/ceph.bootstrap-mgr.keyring index accfd2a..2ab126a 100644 --- a/ceph.bootstrap-mgr.keyring +++ b/ceph.bootstrap-mgr.keyring @@ -1,3 +1,3 @@ [client.bootstrap-mgr] - key = AQACjG9eMEDrHRAAEq5BZTV+Pxn1ONEzOaiO0A== + key = AQBEUXJeVuH8IhAA5YgFIpggxebNgELWg891hw== caps mon = "allow profile bootstrap-mgr" diff --git a/ceph.bootstrap-osd.keyring b/ceph.bootstrap-osd.keyring index 0fe6159..28b4161 100644 --- a/ceph.bootstrap-osd.keyring +++ b/ceph.bootstrap-osd.keyring @@ -1,3 +1,3 @@ [client.bootstrap-osd] - key = AQACjG9esIzrHRAAnEI6Zvk6w/KF+Kh4XGJ2tg== + key = AQBEUXJeHUX9IhAAoCa5bSDNnpKTrkLjldTuwA== caps mon = "allow profile bootstrap-osd" diff --git a/ceph.bootstrap-rgw.keyring b/ceph.bootstrap-rgw.keyring index a3d5707..7885ab7 100644 --- a/ceph.bootstrap-rgw.keyring +++ b/ceph.bootstrap-rgw.keyring @@ -1,3 +1,3 @@ [client.bootstrap-rgw] - key = AQACjG9e+nPsHRAATxfsHKbKgQyoNUE+6wzAng== + key = AQBEUXJeHXD+IhAAZhpROqBnVM/NuaTnAPG9dQ== caps mon = "allow profile bootstrap-rgw" diff --git a/ceph.client.admin.keyring b/ceph.client.admin.keyring index 3233ffc..95f5d01 100644 --- a/ceph.client.admin.keyring +++ b/ceph.client.admin.keyring @@ -1,5 +1,5 @@ [client.admin] - key = AQACjG9e2HbqHRAAeKI0XXHCu0sGwhtqHG7/6g== + key = AQBEUXJe3ez7IhAAjt6d3nLr5GISaHgPV84lKw== caps mds = "allow *" caps mgr = "allow *" caps mon = "allow *" diff --git a/ceph.client.ceph.keyring b/ceph.client.ceph.keyring index 9bb62e5..447e66c 100644 --- a/ceph.client.ceph.keyring +++ b/ceph.client.ceph.keyring @@ -1,2 +1,2 @@ [client.ceph] - key = AQB1229eE2h1DhAAsq69+tbAUIoDGlYi0QsgMw== + key = AQA/VHJeomHcIhAAmN1ae+RgZdtqEGshg11cfQ== diff --git a/ceph.conf b/ceph.conf index 7d40ab3..4c7b4f9 100644 --- a/ceph.conf +++ b/ceph.conf @@ -1,5 +1,5 @@ [global] -fsid = 2ad12020-b1fe-4b3d-aab7-c62a6e605bc1 +fsid = f33952a3-e074-458b-9ce8-e0e035a2f8c4 #ms_bind_ipv6 = true mon_initial_members = pine01, pine02 mon_host = [v2:192.168.10.160:3300,v1:192.168.10.160:6789], [v2:192.168.10.161:3300,v1:192.168.10.161:6789] @@ -14,10 +14,13 @@ osd pool default size = 2 # Write an object 3 times. osd pool default min size = 1 # Allow writing two copies in a degraded state. osd max backfills = 1 #50mb / 5mb / 64mb -osd_memory_target = 268435456 #256Mb / 5 sata ports -bluestore_cache_autotune = false +mon_osd_cache_size_min = 134217728 #default 128Mb +osd_memory_target = 134217728 #128 Mb/ 5 sata ports +osd_memory_base = 134217728 #128 Mb/ 5 sata ports +osd_memory_cache_min = 67108864 #64Mb +bluestore_cache_autotune = true bluestore_cache_size = 52428800 bluestore_cache_size_hdd = 5242880 bluestore_cache_size_ssd = 5242880 -bluestore_cache_kv_max = 67108864 - +#bluestore_cache_kv_max = 67108864 +rocksdb_cache_size = 5242880 diff --git a/ceph.mon.keyring b/ceph.mon.keyring index 100132b..fa434b9 100644 --- a/ceph.mon.keyring +++ b/ceph.mon.keyring @@ -1,3 +1,3 @@ [mon.] -key = AQCli29eAAAAABAAtNcSXfuMZsgxA46cfTQeFw== +key = AQDmUHJeAAAAABAAG+PZK0Vk3qbWra7BWSMwyw== caps mon = allow *