Merge lp:~paulgear/charms/trusty/quantum-gateway/ethX-vlan-support into lp:~openstack-charmers/charms/trusty/quantum-gateway/next

[Paul Gear]

Just read https://wiki.ubuntu.com/ServerTeam/OpenStackCharms/ and realised this should be submitted against next rather than trunk.

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

charm_lint_check #1507 quantum-gateway-next for paulgear mp248326
    LINT OK: passed

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

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

charm_unit_test #1461 quantum-gateway-next for paulgear mp248326
    UNIT OK: passed

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

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

charm_amulet_test #1626 quantum-gateway-next for paulgear mp248326
    AMULET OK: passed

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

[Liam Young (gnuoy)]

Hi Paul, thanks for taking the time to submit the mp. I see a charmhelper sync sneaked in yesterday so this has, in effect, already landed.
Thanks
Liam

review: Disapprove

[Paul Gear (paulgear)]

Thanks Liam - do you want me to update the corresponding bug?

Unmerged revisions

86. By Paul Gear on 2015-02-03

Merge latest charm-helpers

=== modified file 'hooks/charmhelpers/contrib/network/ufw.py'
--- hooks/charmhelpers/contrib/network/ufw.py	2015-01-23 11:08:26 +0000
+++ hooks/charmhelpers/contrib/network/ufw.py	2015-02-03 00:34:10 +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/core/host.py'
--- hooks/charmhelpers/core/host.py	2015-01-23 11:08:26 +0000
+++ hooks/charmhelpers/core/host.py	2015-02-03 00:34:10 +0000
@@ -361,7 +361,7 @@
         ip_output = (line for line in ip_output if line)
         for line in ip_output:
             if line.split()[1].startswith(int_type):
-                matched = re.search('.*: (bond[0-9]+\.[0-9]+)@.*', line)
+                matched = re.search('.*: (' + int_type + r'[0-9]+\.[0-9]+)@.*', line)
                 if matched:
                     interface = matched.groups()[0]
                 else:

=== modified file 'hooks/charmhelpers/core/sysctl.py'
--- hooks/charmhelpers/core/sysctl.py	2015-01-23 11:08:26 +0000
+++ hooks/charmhelpers/core/sysctl.py	2015-02-03 00:34:10 +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])