diff --git a/group_vars/all.sample b/group_vars/all.sample index 132325ee0..158a6452a 100644 --- a/group_vars/all.sample +++ b/group_vars/all.sample @@ -306,6 +306,7 @@ dummy: #radosgw_dns_name: your.subdomain.tld # subdomains used by radosgw. See http://ceph.com/docs/master/radosgw/config/#enabling-subdomain-s3-calls #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 }}" #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/defaults/main.yml b/roles/ceph-common/defaults/main.yml index d235453cd..7275c3e81 100644 --- a/roles/ceph-common/defaults/main.yml +++ b/roles/ceph-common/defaults/main.yml @@ -298,6 +298,7 @@ mds_use_fqdn: false # if set to true, the MDS name used will be the fqdn in the #radosgw_dns_name: your.subdomain.tld # subdomains used by radosgw. See http://ceph.com/docs/master/radosgw/config/#enabling-subdomain-s3-calls 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 }}" 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 23482bdce..2d7eed0b2 100644 --- a/roles/ceph-common/templates/ceph.conf.j2 +++ b/roles/ceph-common/templates/ceph.conf.j2 @@ -189,7 +189,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_port }} +rgw frontends = civetweb port={{ radosgw_civetweb_bind_ip }}:{{ radosgw_civetweb_port }} {% endif %} {% if radosgw_keystone %} rgw keystone url = {{ radosgw_keystone_url }}