Fix Rados Gateway socket path

Fixes: #217
Signed-off-by: Sébastien Han <sebastien.han@enovance.com>

diff --git a/roles/ceph-radosgw/files/s3gw.fcgi b/roles/ceph-radosgw/files/s3gw.fcgi
deleted file mode 100644 (file)
index e766fcb..0000000
--- a/roles/ceph-radosgw/files/s3gw.fcgi
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/radosgw -c /etc/ceph/ceph.conf -n client.radosgw.gateway

diff --git a/roles/ceph-radosgw/tasks/install_debian.yml b/roles/ceph-radosgw/tasks/install_debian.yml
index 3460a22e4cbfb269af5cb608b9c510e8ea7cdd56..de3a362831b8c6fafd83979ca8f046d6a8023a00 100644 (file)
--- a/roles/ceph-radosgw/tasks/install_debian.yml
+++ b/roles/ceph-radosgw/tasks/install_debian.yml
@@ -136,8 +136,8 @@
     - restart apache2
 
 - name: Install s3gw.fcgi script
-  copy: >
-    src=s3gw.fcgi
+  template: >
+    src=s3gw.fcgi.j2
     dest=/var/www/s3gw.fcgi
     mode=0555
     owner=root

diff --git a/roles/ceph-radosgw/tasks/install_redhat.yml b/roles/ceph-radosgw/tasks/install_redhat.yml
index 9da4ee4e1659eed3cfa6b5daab6cc5d3d84d7386..94d1fd73b3ce4aa16d9e6cbadf13b97d81775a93 100644 (file)
--- a/roles/ceph-radosgw/tasks/install_redhat.yml
+++ b/roles/ceph-radosgw/tasks/install_redhat.yml
@@ -47,8 +47,8 @@
     mode=0644
 
 - name: Install s3gw.fcgi script
-  copy: >
-    src=s3gw.fcgi
+  template: >
+    src=s3gw.fcgi.j2
     dest=/var/www/s3gw.fcgi
     mode=0555
     owner=root

diff --git a/roles/ceph-radosgw/templates/rgw.conf b/roles/ceph-radosgw/templates/rgw.conf
index 864a2b4f70c26a7626d0a228163996ceaaa2f1e1..f934d3adc7ef79bacd591c6a634fcc59ff188bde 100644 (file)
--- a/roles/ceph-radosgw/templates/rgw.conf
+++ b/roles/ceph-radosgw/templates/rgw.conf
@@ -1,6 +1,6 @@
 # {{ ansible_managed }}
 
-FastCgiExternalServer /var/www/s3gw.fcgi -socket /tmp/radosgw.sock
+FastCgiExternalServer /var/www/s3gw.fcgi -socket  /tmp/radosgw-{{ ansible_hostname }}.sock
 <VirtualHost *:80>
         ServerName {{ ansible_hostname }}
         ServerAdmin {{ email_address }}@{{ ansible_fqdn }}

diff --git a/roles/ceph-radosgw/templates/s3gw.fcgi.j2 b/roles/ceph-radosgw/templates/s3gw.fcgi.j2
new file mode 100644 (file)
index 0000000..f309fff
--- /dev/null
+++ b/roles/ceph-radosgw/templates/s3gw.fcgi.j2
@@ -0,0 +1,3 @@
+# {{ ansible_managed }}
+#!/bin/sh
+exec /usr/bin/radosgw -c /etc/ceph/ceph.conf -n client.radosgw.{{ ansible_hostname }}