Merge lp:~xianghui/charms/precise/ceph-radosgw/ceph_fastcgi into lp:~openstack-charmers-archive/charms/trusty/ceph-radosgw/next

[James Page]

[Liang Chen, Hui Xiang] Use Ceph build FastCGI for chunked tranfer support.
    Fix bug #1329360 #1313758

[James Page (james-page)]

review: Needs Fixing

[James Page (james-page)]

Also you need to follow the stable charm policy outlined:

https://wiki.ubuntu.com/ServerTeam/OpenStackCharms

Re-targetting for /next first.

[Edward Hope-Morley (hopem)]

Hui, I have proposed a new patches for this here - https://code.launchpad.net/~openstack-charmers/charms/trusty/ceph-radosgw/next.http-100-continue-packages-support

review: Disapprove

Unmerged revisions

22. By Xiang Hui on 2014-07-25

[Liang Chen, Hui Xiang] Use Ceph build FastCGI for chunked tranfer support.

=== modified file 'README.md'
--- README.md	2013-05-10 09:25:06 +0000
+++ README.md	2014-07-28 08:57:03 +0000
@@ -80,3 +80,7 @@
 As such it will try to automatically enable the multiverse pocket in
 /etc/apt/sources.list.  Note that there is noting 'wrong' with multiverse
 components - they typically have less liberal licensing policies or suchlike.
+
+Note: For x86_64 arch, a Ceph build version of FastCGI will be installed to support
+advanced features - 100 continue and chunked transfer. The later one in particular
+is nesessary for a full compatibility with Swift.

=== modified file 'config.yaml'
--- config.yaml	2014-03-25 18:44:22 +0000
+++ config.yaml	2014-07-28 08:57:03 +0000
@@ -46,3 +46,9 @@
     default: False
     description: |
       If set to True, supporting services will log to syslog.
+  use-patched-fastcgi:
+    type: boolean
+    default: False
+    description: |
+      Ceph patched version of libfastcgi supports advanced features - 100 continue and chunked transfer. 
+      Chunked transfer is nesessary for a full compatibility with Swift.

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-07-23 11:37:44 +0000
+++ hooks/hooks.py	2014-07-28 08:57:03 +0000
@@ -34,6 +34,7 @@
     render_template,
     get_host_ip,
     enable_pocket,
+    config_fastcgi_repo,
     is_apache_24
 )
 
@@ -55,7 +56,10 @@
 @hooks.hook('install')
 def install():
     execd_preinstall()
-    enable_pocket('multiverse')
+    if config('use-patched-fastcgi'):
+        config_fastcgi_repo()
+    else:
+        enable_pocket('multiverse')
     add_source(config('source'), config('key'))
     apt_update(fatal=True)
     apt_install(['radosgw',

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2014-01-24 16:21:42 +0000
+++ hooks/utils.py	2014-07-28 08:57:03 +0000
@@ -10,9 +10,13 @@
 import socket
 import re
 import os
+import subprocess
 
 from charmhelpers.core.hookenv import unit_get
+from charmhelpers.core.host import lsb_release
 from charmhelpers.fetch import apt_install
+from charmhelpers.fetch import add_source
+from charmhelpers.fetch import apt_update, apt_upgrade
 
 TEMPLATES_DIR = 'templates'
 
@@ -67,3 +71,25 @@
         return True
     else:
         return False
+
+
+CEPH_FASTCGI_REPO = \
+    "http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-" + \
+    lsb_release()['DISTRIB_CODENAME'] + \
+    "-x86_64-basic/ref/master "
+CEPH_REPO_KEY = "6EAEAE2203C3951A"
+
+
+def config_fastcgi_repo():
+    arch = get_cpu_arch()
+    if(arch == 'x86_64'):
+        add_source(CEPH_FASTCGI_REPO, CEPH_REPO_KEY)
+    else:
+        enable_pocket('multiverse')
+
+
+def get_cpu_arch():
+    ''' Retrun CPU architecture info '''
+    cmd = ['uname', '-m']
+    arch_output = subprocess.check_output(cmd).split('\n')
+    return arch_output[0]