ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #787 from ceph/civet-threads 

ceph-rgw: implement num_threads for civetweb
pull/805/head
Leseb 2016-05-20 14:32:16 +02:00
parent cc894d4044 82aec38a71
commit a61da9bd81
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/all.sample
View File

@ -26,6 +26,7 @@ dummy:
#mds_group_name: mdss #mds_group_name: mdss
#restapi_group_name: restapis #restapi_group_name: restapis
#rbdmirror_group_name: rbdmirrors #rbdmirror_group_name: rbdmirrors
#client_group_name: clients
# If check_firewall is true, then ansible will try to determine if the # 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 # 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_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_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_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: 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_url: # url:admin_port ie: http://192.168.0.1:35357
#radosgw_keystone_admin_token: password #radosgw_keystone_admin_token: password

4
group_vars/clients.sample
View File

@ -16,7 +16,9 @@ dummy:
#user_config: false #user_config: false
#pools: #pools:
# - { name: test, pgs: "{{ pool_default_pg_num }}" } # - { name: test, pgs: "{{ pool_default_pg_num }}" }
# - { name: test2, pgs: "{{ pool_default_pg_num }}" }
#keys: #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'" }

1
roles/ceph-common/defaults/main.yml
View File

@ -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_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_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_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: 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_url: # url:admin_port ie: http://192.168.0.1:35357
radosgw_keystone_admin_token: password radosgw_keystone_admin_token: password

2
roles/ceph-common/templates/ceph.conf.j2
View File

@ -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 log file = /var/log/ceph/{{ cluster }}-rgw-{{ hostvars[host]['ansible_hostname'] }}.log
rgw data = /var/lib/ceph/radosgw/{{ cluster }}-rgw.{{ hostvars[host]['ansible_hostname'] }} rgw data = /var/lib/ceph/radosgw/{{ cluster }}-rgw.{{ hostvars[host]['ansible_hostname'] }}
{% if radosgw_frontend == 'civetweb' %} {% 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 %} {% endif %}
{% if radosgw_keystone %} {% if radosgw_keystone %}
rgw keystone url = {{ radosgw_keystone_url }} rgw keystone url = {{ radosgw_keystone_url }}