From: Sébastien Han <sebastien.han@enovance.com>
Date: Mon, 2 Mar 2015 09:48:18 +0000 (+0100)
Subject: Fix Rados Gateway socket path
X-Git-Tag: v1.0.0~251^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=962d1ad17f243c40739222fb1b5567239c1d9913;p=ceph-ansible.git

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
index e766fcb98..000000000
--- 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 3460a22e4..de3a36283 100644
--- 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 9da4ee4e1..94d1fd73b 100644
--- 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 864a2b4f7..f934d3adc 100644
--- 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
index 000000000..f309fff7f
--- /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 }}