manage rgw_port on radosgw recipe

diff --git a/attributes/radosgw.rb b/attributes/radosgw.rb
index 0abf179dab5ae7b2b780fdc8bdc39b93e84d718e..36aea39031238bf78c401da232dc0233c07c5f5f 100644 (file)
--- a/attributes/radosgw.rb
+++ b/attributes/radosgw.rb
@@ -19,4 +19,4 @@
 default["ceph"]["radosgw"]["api_fqdn"] = "localhost"
 default["ceph"]["radosgw"]["admin_email"] = "admin@example.com"
 default["ceph"]["radosgw"]["rgw_addr"] = "*:80"
-
+default["ceph"]["radosgw"]["rgw_port"] = false

diff --git a/templates/default/rgw.conf.erb b/templates/default/rgw.conf.erb
index 11fb8f2340ba299563f3dcccae61a9f1d79e26f4..9a22c7a99515488fae53579e623c5fe928fd1bd7 100644 (file)
--- a/templates/default/rgw.conf.erb
+++ b/templates/default/rgw.conf.erb
@@ -1,4 +1,8 @@
+<% if node['ceph']['radosgw']['rgw_port'] -%>
+FastCgiExternalServer /var/www/dummyradosgw.fcgi -host 127.0.0.1:<%= node['ceph']['radosgw']['rgw_port'] %>
+<% else -%>
 FastCgiExternalServer /var/www/dummyradosgw.fcgi -socket /var/run/ceph/radosgw.client.radosgw.<%= node[:hostname] %>
+<% end -%>
 
 LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" proxy_combined
 LogFormat "%{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" proxy_debug