From 84e57724e380200d8692bb808522efe322d91a5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 5 Apr 2016 16:22:29 +0200 Subject: [PATCH 1/2] ceph-common: change the pool_default_size to 3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 3 has been the default since Firefly I believe so we should stick with this value. Signed-off-by: Sébastien Han --- group_vars/all.sample | 2 +- roles/ceph-common/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/group_vars/all.sample b/group_vars/all.sample index 3fb36ea40..5ef576781 100644 --- a/group_vars/all.sample +++ b/group_vars/all.sample @@ -215,7 +215,7 @@ dummy: #journal_size: 0 #pool_default_pg_num: 128 #pool_default_pgp_num: 128 -#pool_default_size: 2 +#pool_default_size: 3 #pool_default_min_size: 1 #public_network: 0.0.0.0/0 #cluster_network: "{{ public_network }}" diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml index c951a7386..fef28e0d0 100644 --- a/roles/ceph-common/defaults/main.yml +++ b/roles/ceph-common/defaults/main.yml @@ -207,7 +207,7 @@ mon_pg_warn_max_object_skew: 10 # set to 20 or higher to disable complaints abou journal_size: 0 pool_default_pg_num: 128 pool_default_pgp_num: 128 -pool_default_size: 2 +pool_default_size: 3 pool_default_min_size: 1 public_network: 0.0.0.0/0 cluster_network: "{{ public_network }}" From 2b7da0058b27cb4c0a27f4c15118d121c8391305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 5 Apr 2016 16:24:21 +0200 Subject: [PATCH 2/2] vagrant use pool_default_size to 2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For dev envs it is easir to use a replica count of 2 instead of 3. Signed-off-by: Sébastien Han --- Vagrantfile | 1 + ceph-aio-no-vagrant.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index dcfe2fc2c..f985ae76d 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -67,6 +67,7 @@ ansible_provision = proc do |ansible| ansible.extra_vars = { "ceph_#{settings['ceph_install_source']}"=> 'true', journal_collocation: 'true', + pool_default_size: '2', journal_size: 100, monitor_interface: ETH, cluster_network: "#{SUBNET}.0/24", diff --git a/ceph-aio-no-vagrant.sh b/ceph-aio-no-vagrant.sh index 8a6c35d4d..03e189c72 100644 --- a/ceph-aio-no-vagrant.sh +++ b/ceph-aio-no-vagrant.sh @@ -32,6 +32,7 @@ cp group_vars/osds.sample group_vars/osds sed -i "s/#osd_auto_discovery: false/osd_auto_discovery: true/" group_vars/osds sed -i "s/#journal_collocation: false/journal_collocation: true/" group_vars/osds sed -i "s/#ceph_dev: false/ceph_dev: true/" group_vars/all +sed -i "s/#pool_default_size: 3/pool_default_size: 2/" group_vars/all sed -i "s/#monitor_address: 0.0.0.0/monitor_address: ${MON_IP}/" group_vars/all sed -i "s/#journal_size: 0/journal_size: 100/" group_vars/all sed -i "s|#public_network: 0.0.0.0\/0|public_network: ${SUBNET}|" group_vars/all