Merge lp:~gnuoy/charm-helpers/memcache-test-fixes into lp:charm-helpers

[Liam Young]

[Alex Kavanagh (ajkavanagh)]

LGTM.

review: Approve

=== modified file 'charmhelpers/contrib/amulet/utils.py'
--- charmhelpers/contrib/amulet/utils.py	2016-10-13 13:28:00 +0000
+++ charmhelpers/contrib/amulet/utils.py	2016-12-12 13:30:30 +0000
@@ -148,7 +148,8 @@
 
             for service_name in services_list:
                 if (self.ubuntu_releases.index(release) >= systemd_switch or
-                        service_name in ['rabbitmq-server', 'apache2']):
+                        service_name in ['rabbitmq-server', 'apache2',
+                                         'memcached']):
                     # init is systemd (or regular sysv)
                     cmd = 'sudo service {} status'.format(service_name)
                     output, code = sentry_unit.run(cmd)
 
=== modified file 'charmhelpers/contrib/openstack/amulet/utils.py'
--- charmhelpers/contrib/openstack/amulet/utils.py	2016-12-07 10:34:35 +0000
+++ charmhelpers/contrib/openstack/amulet/utils.py	2016-12-12 13:30:30 +0000
@@ -1177,9 +1177,14 @@
                        '/etc/memcached.conf')
         contents = self.file_contents_safe(sentry_unit, '/etc/memcached.conf',
                                            fatal=True)
+        ubuntu_release, _ = self.run_cmd_unit(sentry_unit, 'lsb_release -cs')
+        if ubuntu_release <= 'trusty':
+            memcache_listen_addr = 'ip6-localhost'
+        else:
+            memcache_listen_addr = '::1'
         expected = {
             '-p': '11211',
-            '-l': '::1'}
+            '-l': memcache_listen_addr}
         found = []
         for key, value in expected.items():
             for line in contents.split('\n'):