Merge lp:~seyeongkim/charms/trusty/ceph-radosgw/lp1353246 into lp:~openstack-charmers-archive/charms/trusty/ceph-radosgw/next

Proposed by Seyeong Kim
Status: Merged
Merged at revision: 25
Proposed branch: lp:~seyeongkim/charms/trusty/ceph-radosgw/lp1353246
Merge into: lp:~openstack-charmers-archive/charms/trusty/ceph-radosgw/next
Diff against target: 19 lines (+2/-2)
2 files modified
files/www/s3gw.fcgi (+1/-1)
templates/ceph.conf (+1/-1)
To merge this branch: bzr merge lp:~seyeongkim/charms/trusty/ceph-radosgw/lp1353246
Reviewer Review Type Date Requested Status
Edward Hope-Morley Needs Fixing
Review via email: mp+229734@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Edward Hope-Morley (hopem) wrote :

Hmm, fairly sure this used to be fine. Will this not break backwards compatibility with older versions of Ceph? Also, the ceph charm is expecting this to be client.radosgw.gateway. I guess we have two choices here, either conditionally change files/www/s3gw.fcgi based on what version of ceph is in use or conditionally set this value.

Revision history for this message
Edward Hope-Morley (hopem) wrote :

Just deployed havana+ceph 0.67 and it works just fine. Was there anything in particular you had to do to hit the issue you are getting?

review: Needs Information
Revision history for this message
Edward Hope-Morley (hopem) wrote :

Ok so, I have looked at this some more. When you are running /var/www/s3gw.fcgi by hand you are getting an error because the client name used in that script is inconsistent with the one configured in /etc/ceph/ceph.conf. When apache runs that script it does:

FastCgiExternalServer /var/www/s3gw.fcgi -socket /tmp/radosgw.sock

So it is providing a socket (incidentally the same as the one in /etc/ceph/ceph.conf). So, i think this is a real bug but it is not likely the soure of your original problem since because apache provide a --socket the command does not error out.

I think we should still fix /var/www/s3gw.fcgi to use the correct ceph client (client.radosgw.gateway) as opposed to your patch which modifes ceph.conf.

review: Needs Fixing
26. By Seyeong Kim

s3gw.fcgi should have same configuration name in ceph.conf

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'files/www/s3gw.fcgi'
2--- files/www/s3gw.fcgi 2012-10-08 15:58:16 +0000
3+++ files/www/s3gw.fcgi 2014-08-07 10:10:15 +0000
4@@ -1,2 +1,2 @@
5 #!/bin/sh
6-exec /usr/bin/radosgw -c /etc/ceph/ceph.conf -n client.rados.gateway
7\ No newline at end of file
8+exec /usr/bin/radosgw -c /etc/ceph/ceph.conf -n client.radosgw.gateway
9
10=== modified file 'templates/ceph.conf'
11--- templates/ceph.conf 2014-07-24 09:48:17 +0000
12+++ templates/ceph.conf 2014-08-07 10:10:15 +0000
13@@ -26,4 +26,4 @@
14 rgw keystone token cache size = {{ cache_size }}
15 rgw keystone revocation interval = {{ revocation_check_interval }}
16 #nss db path = /var/lib/ceph/nss
17-{% endif %}
18\ No newline at end of file
19+{% endif %}

Subscribers

People subscribed via source and target branches