From fe07fad877dbbdd454dd2f6362f9423702179894 Mon Sep 17 00:00:00 2001 From: Stephan Hohn Date: Mon, 9 May 2016 21:00:56 +0200 Subject: [PATCH 1/3] Make install-ansible.sh work with Linux Mint --- install-ansible.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-ansible.sh b/install-ansible.sh index 5e24c2f1a..217ec9016 100755 --- a/install-ansible.sh +++ b/install-ansible.sh @@ -20,7 +20,7 @@ if [[ "Debian" =~ $os_VENDOR ]]; then cd ansible make install mkdir /etc/ansible -elif [[ "Ubuntu" =~ $os_VENDOR ]]; then +elif [[ "Ubuntu" =~ $os_VENDOR || "LinuxMint" =~ $os_VENDOR ]]; then add-apt-repository -y ppa:ansible/ansible apt-get update apt-get install -y ansible From 4dad21c481de9f73f2f8308db0e00906b59f35b1 Mon Sep 17 00:00:00 2001 From: Stephan Hohn Date: Mon, 9 May 2016 22:05:01 +0200 Subject: [PATCH 2/3] Increase system stabillity by re-enabling swap and setting vm.swappiness to 10 --- roles/ceph-common/defaults/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml index 4819b7400..a5de1ae72 100644 --- a/roles/ceph-common/defaults/main.yml +++ b/roles/ceph-common/defaults/main.yml @@ -365,12 +365,13 @@ ceph_conf_overrides: {} ############# disable_transparent_hugepage: true -disable_swap: true +disable_swap: false os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } - { name: vm.zone_reclaim_mode, value: 0 } - { name: vm.vfs_cache_pressure, value: 50 } + - { name: vm.swappiness, value: 10 } - { name: vm.min_free_kbytes, value: "{{ vm_min_free_kbytes }}" } From 6ae24541ce35d60d5a12e3b9e4d34a4cc7b1f017 Mon Sep 17 00:00:00 2001 From: Stephan Hohn Date: Tue, 10 May 2016 10:20:23 +0200 Subject: [PATCH 3/3] align group_vars/all.sample with roles/ceph-common/defaults/main.yml --- group_vars/all.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/group_vars/all.sample b/group_vars/all.sample index c3e7f389f..1743f919c 100644 --- a/group_vars/all.sample +++ b/group_vars/all.sample @@ -314,7 +314,6 @@ dummy: ## MDS options # #mds_use_fqdn: false # if set to true, the MDS name used will be the fqdn in the ceph.conf -#mds_name: "{{ ansible_hostname }}" ## Rados Gateway options # @@ -374,12 +373,13 @@ dummy: ############# #disable_transparent_hugepage: true -#disable_swap: true +#disable_swap: false #os_tuning_params: # - { name: kernel.pid_max, value: 4194303 } # - { name: fs.file-max, value: 26234859 } # - { name: vm.zone_reclaim_mode, value: 0 } # - { name: vm.vfs_cache_pressure, value: 50 } +# - { name: vm.swappiness, value: 10 } # - { name: vm.min_free_kbytes, value: "{{ vm_min_free_kbytes }}" }