ceph-rgw: implement num_threads for civetweb

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/group_vars/all.sample b/group_vars/all.sample
index aa2a9a7d942168ce486ce711595ba14d08493fc8..057f884884fb28f53cbc8a0c4dada18cfc46df7d 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -26,6 +26,7 @@ dummy:
 #mds_group_name: mdss
 #restapi_group_name: restapis
 #rbdmirror_group_name: rbdmirrors
+#client_group_name: clients
 
 # If check_firewall is true, then ansible will try to determine if the
 # Ceph ports are blocked by a firewall. If the machine running ansible
@@ -267,6 +268,7 @@ dummy:
 #radosgw_frontend: civetweb # supported options are 'apache' or 'civetweb', also edit roles/ceph-rgw/defaults/main.yml
 #radosgw_civetweb_port: 8080 # on Infernalis we get: "set_ports_option: cannot bind to 80: 13 (Permission denied)"
 #radosgw_civetweb_bind_ip: "{{ ansible_default_ipv4.address }}"
+#radosgw_civetweb_num_threads: 50
 #radosgw_keystone: false # activate OpenStack Keystone options full detail here: http://ceph.com/docs/master/radosgw/keystone/
 #radosgw_keystone_url: # url:admin_port ie: http://192.168.0.1:35357
 #radosgw_keystone_admin_token: password

diff --git a/group_vars/clients.sample b/group_vars/clients.sample
index b3bca082270387b586b7d70243d516c6ebd3db32..1bd4f600336fcea454a34adc1825cad7fbcf32e1 100644 (file)
--- a/group_vars/clients.sample
+++ b/group_vars/clients.sample
@@ -16,7 +16,9 @@ dummy:
 #user_config: false
 #pools:
 #  - { name: test, pgs: "{{ pool_default_pg_num }}" }
+#  - { name: test2, pgs: "{{ pool_default_pg_num }}" }
 
 #keys:
-#  - { name: client.test, value: "mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool={{ pools.name }}'" }
+#  - { name: client.test, value: "mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool=test'" }
+#  - { name: client.test2, value: "mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool=test2'" }
 

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 4122a4c7070083477d9b3471d4cb3be2c66e9a76..32dbaa8df12205981db00b186dacbce75b5897d1 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -260,6 +260,7 @@ mds_use_fqdn: false # if set to true, the MDS name used will be the fqdn in the
 radosgw_frontend: civetweb # supported options are 'apache' or 'civetweb', also edit roles/ceph-rgw/defaults/main.yml
 radosgw_civetweb_port: 8080 # on Infernalis we get: "set_ports_option: cannot bind to 80: 13 (Permission denied)"
 radosgw_civetweb_bind_ip: "{{ ansible_default_ipv4.address }}"
+radosgw_civetweb_num_threads: 50
 radosgw_keystone: false # activate OpenStack Keystone options full detail here: http://ceph.com/docs/master/radosgw/keystone/
 #radosgw_keystone_url: # url:admin_port ie: http://192.168.0.1:35357
 radosgw_keystone_admin_token: password

diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index e81c21a620b8eaea36d29f7d91d7e4646e791fe2..fa5a8db0648e6aae2ba2b5a21f878f21e0c567a0 100644 (file)
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -81,7 +81,7 @@ rgw socket path = /tmp/radosgw-{{ hostvars[host]['ansible_hostname'] }}.sock
 log file = /var/log/ceph/{{ cluster }}-rgw-{{ hostvars[host]['ansible_hostname'] }}.log
 rgw data = /var/lib/ceph/radosgw/{{ cluster }}-rgw.{{ hostvars[host]['ansible_hostname'] }}
 {% if radosgw_frontend  == 'civetweb' %}
-rgw frontends = civetweb port={{ radosgw_civetweb_bind_ip }}:{{ radosgw_civetweb_port }}
+rgw frontends = civetweb port={{ radosgw_civetweb_bind_ip }}:{{ radosgw_civetweb_port }} num_threads={{ radosgw_civetweb_num_threads }}
 {% endif %}
 {% if radosgw_keystone %}
 rgw keystone url = {{ radosgw_keystone_url }}