Merge lp:~james-page/charms/trusty/neutron-api/stable-bug-1413862 into lp:~openstack-charmers-archive/charms/trusty/neutron-api/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 #2478 neutron-api for james-page mp251901
    LINT OK: passed

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

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

charm_unit_test #2268 neutron-api for james-page mp251901
    UNIT OK: passed

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

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

charm_amulet_test #2351 neutron-api for james-page mp251901
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/10538300/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2351/

=== modified file 'charm-helpers-sync.yaml'
--- charm-helpers-sync.yaml	2015-01-13 14:43:04 +0000
+++ charm-helpers-sync.yaml	2015-03-05 11:16:28 +0000
@@ -1,4 +1,4 @@
-branch: lp:charm-helpers
+branch: lp:~openstack-charmers/charm-helpers/stable
 destination: hooks/charmhelpers
 include:
     - core

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2015-01-26 09:44:26 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-03-05 11:16:28 +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:44:26 +0000
+++ hooks/charmhelpers/core/sysctl.py	2015-03-05 11:16:28 +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])