Merge lp:~james-page/charms/trusty/nova-compute/stable-bug-1413862 into lp:~openstack-charmers-archive/charms/trusty/nova-compute/trunk

[James Page]

Resync helpers to resolve race condition when access-network is set in mysql or percona-cluster charms

Resync helpers to resolve race condition when access-network is set in mysql or percona-cluster charms

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

charm_lint_check #2480 nova-compute for james-page mp251903
    LINT OK: passed

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

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

charm_unit_test #2270 nova-compute for james-page mp251903
    UNIT OK: passed

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

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

charm_amulet_test #2353 nova-compute for james-page mp251903
    AMULET OK: passed

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

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'charm-helpers-hooks.yaml'
--- charm-helpers-hooks.yaml	2015-01-09 15:40:23 +0000
+++ charm-helpers-hooks.yaml	2015-03-05 11:16:45 +0000
@@ -1,4 +1,4 @@
-branch: lp:charm-helpers
+branch: lp:~openstack-charmers/charm-helpers/stable
 destination: hooks/charmhelpers
 include:
     - core

=== modified file 'charm-helpers-tests.yaml'
--- charm-helpers-tests.yaml	2014-09-23 10:21:54 +0000
+++ charm-helpers-tests.yaml	2015-03-05 11:16:45 +0000
@@ -1,4 +1,4 @@
-branch: lp:charm-helpers
+branch: lp:~openstack-charmers/charm-helpers/stable
 destination: tests/charmhelpers
 include:
     - contrib.amulet

=== modified file 'hooks/charmhelpers/contrib/network/ufw.py'
--- hooks/charmhelpers/contrib/network/ufw.py	2015-01-26 09:46:57 +0000
+++ hooks/charmhelpers/contrib/network/ufw.py	2015-03-05 11:16:45 +0000
@@ -53,6 +53,7 @@
     :returns: True if ufw is enabled
     """
     output = subprocess.check_output(['ufw', 'status'],
+                                     universal_newlines=True,
                                      env={'LANG': 'en_US',
                                           'PATH': os.environ['PATH']})
 
@@ -82,6 +83,7 @@
             raise Exception("Couldn't disable IPv6 support in ufw")
 
     output = subprocess.check_output(['ufw', 'enable'],
+                                     universal_newlines=True,
                                      env={'LANG': 'en_US',
                                           'PATH': os.environ['PATH']})
 
@@ -107,6 +109,7 @@
         return True
 
     output = subprocess.check_output(['ufw', 'disable'],
+                                     universal_newlines=True,
                                      env={'LANG': 'en_US',
                                           'PATH': os.environ['PATH']})
 
@@ -151,7 +154,7 @@
         cmd += ['to', dst]
 
     if port is not None:
-        cmd += ['port', port]
+        cmd += ['port', str(port)]
 
     if proto is not None:
         cmd += ['proto', proto]
@@ -208,9 +211,11 @@
     :param action: `open` or `close`
     """
     if action == 'open':
-        subprocess.check_output(['ufw', 'allow', name])
+        subprocess.check_output(['ufw', 'allow', str(name)],
+                                universal_newlines=True)
     elif action == 'close':
-        subprocess.check_output(['ufw', 'delete', 'allow', name])
+        subprocess.check_output(['ufw', 'delete', 'allow', str(name)],
+                                universal_newlines=True)
     else:
         raise Exception(("'{}' not supported, use 'allow' "
                          "or 'delete'").format(action))

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2015-01-26 09:46:57 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-03-05 11:16:45 +0000
@@ -191,7 +191,7 @@
                                         unit=local_unit())
             if set_hostname != access_hostname:
                 relation_set(relation_settings={hostname_key: access_hostname})
-                return ctxt  # Defer any further hook execution for now....
+                return None  # Defer any further hook execution for now....
 
         password_setting = 'password'
         if self.relation_prefix:

=== modified file 'hooks/charmhelpers/core/sysctl.py'
--- hooks/charmhelpers/core/sysctl.py	2015-01-26 09:46:57 +0000
+++ hooks/charmhelpers/core/sysctl.py	2015-03-05 11:16:45 +0000
@@ -26,25 +26,31 @@
 from charmhelpers.core.hookenv import (
     log,
     DEBUG,
+    ERROR,
 )
 
 
 def create(sysctl_dict, sysctl_file):
     """Creates a sysctl.conf file from a YAML associative array
 
-    :param sysctl_dict: a dict of sysctl options eg { 'kernel.max_pid': 1337 }
-    :type sysctl_dict: dict
+    :param sysctl_dict: a YAML-formatted string of sysctl options eg "{ 'kernel.max_pid': 1337 }"
+    :type sysctl_dict: str
     :param sysctl_file: path to the sysctl file to be saved
     :type sysctl_file: str or unicode
     :returns: None
     """
-    sysctl_dict = yaml.load(sysctl_dict)
+    try:
+        sysctl_dict_parsed = yaml.safe_load(sysctl_dict)
+    except yaml.YAMLError:
+        log("Error parsing YAML sysctl_dict: {}".format(sysctl_dict),
+            level=ERROR)
+        return
 
     with open(sysctl_file, "w") as fd:
-        for key, value in sysctl_dict.items():
+        for key, value in sysctl_dict_parsed.items():
             fd.write("{}={}\n".format(key, value))
 
-    log("Updating sysctl_file: %s values: %s" % (sysctl_file, sysctl_dict),
+    log("Updating sysctl_file: %s values: %s" % (sysctl_file, sysctl_dict_parsed),
         level=DEBUG)
 
     check_call(["sysctl", "-p", sysctl_file])

=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2014-12-15 10:28:47 +0000
+++ hooks/nova_compute_context.py	2015-03-05 11:16:45 +0000
@@ -421,9 +421,8 @@
     def __call__(self):
         ctxt = super(NeutronComputeContext, self).__call__()
         # NOTE(jamespage) support override of neutron security via config
-        if config('disable-neutron-security-groups') is not None:
-            ctxt['disable_neutron_security_groups'] = \
-                config('disable-neutron-security-groups')
+        if config('disable-neutron-security-groups'):
+            ctxt['disable_neutron_security_groups'] = True
         return ctxt
 
 

=== modified file 'unit_tests/test_nova_compute_contexts.py'
--- unit_tests/test_nova_compute_contexts.py	2014-12-03 23:23:54 +0000
+++ unit_tests/test_nova_compute_contexts.py	2015-03-05 11:16:45 +0000
@@ -202,8 +202,7 @@
         self.test_config.set('disable-neutron-security-groups', False)
         qplugin = context.NeutronComputeContext()
         with patch.object(qplugin, '_ensure_packages'):
-            self.assertEquals({'disable_neutron_security_groups': False},
-                              qplugin())
+            self.assertEquals({}, qplugin())
 
     @patch('subprocess.call')
     def test_host_IP_context(self, _call):