Add support for subdomain calls in S3 api. See http://ceph.com/docs/master/radosgw...

diff --git a/group_vars/all b/group_vars/all
index 6e5add79ca8e5b18da9e4525e08537f7e4dd4c5f..170915ceac26837bd96d3d72f50c6b8958a17e73 100644 (file)
--- a/group_vars/all
+++ b/group_vars/all
@@ -21,6 +21,7 @@ mds: true # disable mds configuration in ceph.conf
 radosgw: true
 redhat_distro_ceph_extra: centos6.4 # supported distros are centos6.3, centos6.4, centos6, fedora18, fedora19, opensuse12.2, rhel6.3, rhel6.4, rhel6.5, rhel6, sles11sp2
 radosgw_interface: eth1 # the public interface which the radosgw talks to the world with, this variable is used in the haproxy role, this does not need to be set if haproxy is not used.
+#radosgw_dns_name: your.subdomain.tld # subdomains used by radosgw. See http://ceph.com/docs/master/radosgw/config/#enabling-subdomain-s3-calls
 
 # OSD options
 journal_size: 100

diff --git a/roles/common/templates/ceph.conf.j2 b/roles/common/templates/ceph.conf.j2
index 138faa3e8cd2e3cd1e045638ffd263c276158ff9..d7087c897ddedc81baeb7208336b7a8515b24cd3 100644 (file)
--- a/roles/common/templates/ceph.conf.j2
+++ b/roles/common/templates/ceph.conf.j2
@@ -66,6 +66,9 @@
 {% for host in groups['rgws'] %}
 {% if hostvars[host]['ansible_hostname'] is defined %}
 [client.radosgw.gateway]
+  {% if radosgw_dns_name is defined %}
+    rgw dns name = {{ radosgw_dns_name }}
+  {% endif %}
   host = {{ hostvars[host]['ansible_hostname'] }}
   keyring = /etc/ceph/keyring.radosgw.gateway
   rgw socket path = /tmp/radosgw.sock