Merge lp:~adam-collard/charms/trusty/swift-storage/fix-unconditional-service-restart into lp:~openstack-charmers-archive/charms/trusty/swift-storage/next

[Adam Collard]

This branch prevents the swift-storage charm from thinking there was an OpenStack upgrade available at every config-changed.

I had to update the Amulet tests because they were incorrectly asserting that all of the swift services should have been restarted following a change to object-server-threads-per-disk. In fact, only the object services should be restarted, and only are (the test passed prior to this because of the bug in charm-helpers which caused the unconditional OpenStack upgrade, in turn restarting all of the services)

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #9156 swift-storage-next for adam-collard mp269744
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/9156/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #8462 swift-storage-next for adam-collard mp269744
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/8462/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6168 swift-storage-next for adam-collard mp269744
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6168/

[Liam Young (gnuoy)]

Approved

review: Approve

=== modified file 'charmhelpers/contrib/network/ip.py'
--- charmhelpers/contrib/network/ip.py	2015-03-04 09:54:59 +0000
+++ charmhelpers/contrib/network/ip.py	2015-09-01 12:23:46 +0000
@@ -435,8 +435,12 @@
 
         rev = dns.reversename.from_address(address)
         result = ns_query(rev)
+
         if not result:
-            return None
+            try:
+                result = socket.gethostbyaddr(address)[0]
+            except:
+                return None
     else:
         result = address
 

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2015-08-17 13:44:42 +0000
+++ charmhelpers/contrib/openstack/utils.py	2015-09-01 12:23:46 +0000
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
 # Copyright 2014-2015 Canonical Limited.
 #
 # This file is part of charm-helpers.
@@ -195,9 +193,9 @@
         error_out(e)
 
 
-def get_os_version_codename(codename):
+def get_os_version_codename(codename, version_map=OPENSTACK_CODENAMES):
     '''Determine OpenStack version number from codename.'''
-    for k, v in six.iteritems(OPENSTACK_CODENAMES):
+    for k, v in six.iteritems(version_map):
         if v == codename:
             return k
     e = 'Could not derive OpenStack version for '\
@@ -429,7 +427,11 @@
     import apt_pkg as apt
     src = config('openstack-origin')
     cur_vers = get_os_version_package(package)
-    available_vers = get_os_version_install_source(src)
+    if "swift" in package:
+        codename = get_os_codename_install_source(src)
+        available_vers = get_os_version_codename(codename, SWIFT_CODENAMES)
+    else:
+        available_vers = get_os_version_install_source(src)
     apt.init()
     return apt.version_compare(available_vers, cur_vers) == 1
 

=== modified file 'charmhelpers/core/hookenv.py'
--- charmhelpers/core/hookenv.py	2015-08-17 13:44:42 +0000
+++ charmhelpers/core/hookenv.py	2015-09-01 12:23:46 +0000
@@ -767,21 +767,23 @@
 
 
 def status_get():
-    """Retrieve the previously set juju workload state
-
-    If the status-set command is not found then assume this is juju < 1.23 and
-    return 'unknown'
+    """Retrieve the previously set juju workload state and message
+
+    If the status-get command is not found then assume this is juju < 1.23 and
+    return 'unknown', ""
+
     """
-    cmd = ['status-get']
+    cmd = ['status-get', "--format=json", "--include-data"]
     try:
-        raw_status = subprocess.check_output(cmd, universal_newlines=True)
-        status = raw_status.rstrip()
-        return status
+        raw_status = subprocess.check_output(cmd)
     except OSError as e:
         if e.errno == errno.ENOENT:
-            return 'unknown'
+            return ('unknown', "")
         else:
             raise
+    else:
+        status = json.loads(raw_status.decode("UTF-8"))
+        return (status["status"], status["message"])
 
 
 def translate_exc(from_exc, to_exc):

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-08-22 04:12:14 +0000
+++ tests/basic_deployment.py	2015-09-01 12:23:46 +0000
@@ -429,19 +429,10 @@
 
         # Config file affected by juju set config change, and
         # services which are expected to restart upon config change
-        services = {'swift-account-server': 'account-server.conf',
-                    'swift-account-auditor': 'account-server.conf',
-                    'swift-account-reaper': 'account-server.conf',
-                    'swift-account-replicator': 'account-server.conf',
-                    'swift-container-server': 'container-server.conf',
-                    'swift-container-auditor': 'container-server.conf',
-                    'swift-container-replicator': 'container-server.conf',
-                    'swift-container-updater': 'container-server.conf',
-                    'swift-object-server': 'object-server.conf',
+        services = {'swift-object-server': 'object-server.conf',
                     'swift-object-auditor': 'object-server.conf',
                     'swift-object-replicator': 'object-server.conf',
-                    'swift-object-updater': 'object-server.conf',
-                    'swift-container-sync': 'container-server.conf'}
+                    'swift-object-updater': 'object-server.conf'}
 
         # Make config change, check for service restarts
         u.log.debug('Making config change on {}...'.format(juju_service))