Merge lp:~gnuoy/charms/trusty/ceph-radosgw/stable-pkgrevno-from-charmhelpers into lp:~openstack-charmers-archive/charms/trusty/ceph-radosgw/trunk

[Liam Young]

[Chris Glass (tribaal)]

This can be tested from cs:~tribaal/charms/trusty/ceph-radosgw-1

[Chris Glass (tribaal)]

This looks good! +1 provided Fernando adds a comment when his test run succeeds :)

review: Approve

[Fernando Correa Neto (fcorrea)]

Test run succeeded.

=== modified file 'hooks/ceph.py'
--- hooks/ceph.py	2014-01-24 16:04:49 +0000
+++ hooks/ceph.py	2014-09-26 09:33:40 +0000
@@ -11,7 +11,6 @@
 import subprocess
 import time
 import os
-import apt_pkg as apt
 
 from socket import gethostname as get_unit_hostname
 
@@ -220,17 +219,3 @@
             if 'key' in element:
                 key = element.split(' = ')[1].strip()  # IGNORE:E1103
     return key
-
-
-def get_ceph_version(package=None):
-    apt.init()
-    cache = apt.Cache()
-    pkg = cache[package or 'ceph']
-    if pkg.current_ver:
-        return apt.upstream_version(pkg.current_ver.ver_str)
-    else:
-        return None
-
-
-def version_compare(a, b):
-    return apt.version_compare(a, b)
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-03-25 18:44:22 +0000
+++ hooks/hooks.py	2014-09-26 09:33:40 +0000
@@ -38,6 +38,7 @@
 )
 
 from charmhelpers.payload.execd import execd_preinstall
+from charmhelpers.core.host import cmp_pkgrevno
 from socket import gethostname as get_unit_hostname
 
 hooks = Hooks()
@@ -73,13 +74,13 @@
         'auth_supported': get_auth() or 'none',
         'mon_hosts': ' '.join(get_mon_hosts()),
         'hostname': get_unit_hostname(),
-        'version': ceph.get_ceph_version('radosgw'),
+        'old_auth': cmp_pkgrevno('radosgw', "0.51") < 0,
         'use_syslog': str(config('use-syslog')).lower()
     }
 
     # Check to ensure that correct version of ceph is
     # in use
-    if ceph.get_ceph_version('radosgw') >= "0.55":
+    if cmp_pkgrevno('radosgw', '0.55') >= 0:
         # Add keystone configuration if found
         ks_conf = get_keystone_conf()
         if ks_conf:
@@ -208,7 +209,7 @@
 
 @hooks.hook('identity-service-relation-joined')
 def identity_joined(relid=None):
-    if ceph.get_ceph_version('radosgw') < "0.55":
+    if cmp_pkgrevno('radosgw', '0.55') < 0:
         log('Integration with keystone requires ceph >= 0.55')
         sys.exit(1)
 
 
=== modified file 'templates/ceph.conf'
--- templates/ceph.conf	2014-03-25 18:44:22 +0000
+++ templates/ceph.conf	2014-09-26 09:33:40 +0000
@@ -1,5 +1,5 @@
 [global]
-{% if version < "0.51" %}
+{% if old_auth %}
  auth supported = {{ auth_supported }}
 {% else %}
  auth cluster required = {{ auth_supported }}