Adds aliases for custom radosgw configurations

Author: Walter Huf

providers/radosgw.rb

@@ -38,7 +38,8 @@ def whyrun_supported?
   instance['keyring'] = "/etc/ceph/ceph.#{keyname}.keyring"
   instance['rgw socket path'] = @new_resource.socket_path || "/var/run/ceph/radosgw.#{zone}.#{node['hostname']}"
   instance['rgw dns name'] = @new_resource.dns_name
-  instance['rgw print continue'] = @new_resource.print_continue unless @new_resource.print_continue.nil?
+  instance['api_aliases'] = @new_resource.dns_aliases if @new_resource.dns_aliases
+  instance['rgw print continue'] = @new_resource.print_continue.to_s unless @new_resource.print_continue.nil?
 
   node.default['ceph']['radosgw']['instances'][keyname] = instance
 

resources/radosgw.rb

@@ -12,6 +12,7 @@
 # other radosgw settings
 attribute :keyname, :kind_of => String, :default => nil  # defaults to client.radosgw.#{zone}.#{hostname}, used to generate key
 attribute :dns_name, :kind_of => String
+attribute :dns_aliases, :kind_of => Array, :default => nil  # turns into ServerAlias lines
 attribute :socket_path, :kind_of => String, :default => nil # defaults to /var/run/ceph/ceph-radosgw.#{zone}.#{hostname}
 attribute :print_continue, :kind_of => [TrueClass, FalseClass], :default => nil
 

templates/default/ceph.conf.erb

@@ -49,7 +49,7 @@
 [<%= name %>]
   host = <%= node['hostname'] %>
   log file = /var/log/ceph/radosgw-<%= instance['rgw zone'] %>.log
-<%- instance.sort.each do |k,v| %>
+<%- instance.sort.reject{ |k,v| (! k.is_a? String) || (! v.is_a? String) }.each do |k,v| %>
   <%= k %> = <%= v %>
 <%- end %>
 <%- end # radosgw.instances.each -%>

test/cookbooks/ceph_test/recipes/radosgw_zone.rb

@@ -23,7 +23,10 @@
   region_root_pool '.rgw.root'
   zone_root_pool '.rgw.root'
   dns_name 'ceph.test'
+  dns_aliases ['*.ceph.test']
   keyname 'client.radosgw.us-test'
   socket_path '/var/run/ceph/radosgw.us-test'
   print_continue true
 end.run_action(:add)
+
+package 'curl'   # used for the tests

test/integration/aio/bats/radosgw_zone.bats

@@ -9,6 +9,8 @@
   echo "$settings" | grep 'keyring = /etc/ceph/ceph.client.radosgw.us-test.keyring' > /dev/null
   echo "$settings" | grep 'rgw socket path = /var/run/ceph/radosgw.us-test' > /dev/null
   echo "$settings" | grep 'rgw dns name = ceph.test' > /dev/null
+  echo "$settings" | grep -v 'api_aliases' > /dev/null
+  echo "$settings" | grep -v 'rgw dns aliases' > /dev/null
   echo "$settings" | grep 'rgw print continue = true' > /dev/null
 }
 
@@ -28,9 +30,13 @@
   test -e $filename
   grep 'FastCgiExternalServer /var/www/s3gw-default.fcgi -socket /var/run/ceph/radosgw.us-test' $filename > /dev/null
   grep 'ServerName ceph.test' $filename > /dev/null
+  grep 'ServerAlias \*.ceph.test' $filename > /dev/null
   grep 'RewriteRule.*s3gw-default.fcgi' $filename > /dev/null
 }
 
 @test "radosgw for test zone responds via apache" {
   wget http://localhost --header=host:ceph.test -O- | grep ListAllMyBucketsResult > /dev/null
 }
+@test "radosgw for test zone subdomain responds via apache" {
+  curl http://localhost --header host:sub.ceph.test | grep NoSuchBucket > /dev/null
+}