Merge lp:~ivoks/charm-helpers/neutron-alchemy into lp:charm-helpers

[Ante Karamatić]

Adds support for customizing Neutron/Quantum alchemy variables

[Marco Ceppi (marcoceppi)]

LGTM

review: Approve

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2014-01-08 12:11:11 +0000
+++ charmhelpers/contrib/openstack/context.py	2014-01-30 13:37:58 +0000
@@ -67,6 +67,43 @@
     return True
 
 
+def config_flags_parser(config_flags):
+    if config_flags.find('==') >= 0:
+        log("config_flags is not in expected format (key=value)",
+            level=ERROR)
+        raise OSContextError
+    # strip the following from each value.
+    post_strippers = ' ,'
+    # we strip any leading/trailing '=' or ' ' from the string then
+    # split on '='.
+    split = config_flags.strip(' =').split('=')
+    limit = len(split)
+    flags = {}
+    for i in xrange(0, limit - 1):
+        current = split[i]
+        next = split[i + 1]
+        vindex = next.rfind(',')
+        if (i == limit - 2) or (vindex < 0):
+            value = next
+        else:
+            value = next[:vindex]
+
+        if i == 0:
+            key = current
+        else:
+            # if this not the first entry, expect an embedded key.
+            index = current.rfind(',')
+            if index < 0:
+                log("invalid config value(s) at index %s" % (i),
+                    level=ERROR)
+                raise OSContextError
+            key = current[index + 1:]
+
+        # Add to collection.
+        flags[key.strip(post_strippers)] = value.rstrip(post_strippers)
+    return flags
+
+
 class OSContextGenerator(object):
     interfaces = []
 
@@ -430,6 +467,11 @@
         elif self.plugin == 'nvp':
             ctxt.update(self.nvp_ctxt())
 
+        alchemy_flags = config('neutron-alchemy-flags')
+        if alchemy_flags:
+            flags = config_flags_parser(alchemy_flags)
+            ctxt['neutron_alchemy_flags'] = flags
+
         self._save_flag_file()
         return ctxt
 
@@ -450,41 +492,7 @@
             if not config_flags:
                 return {}
 
-            if config_flags.find('==') >= 0:
-                log("config_flags is not in expected format (key=value)",
-                    level=ERROR)
-                raise OSContextError
-
-            # strip the following from each value.
-            post_strippers = ' ,'
-            # we strip any leading/trailing '=' or ' ' from the string then
-            # split on '='.
-            split = config_flags.strip(' =').split('=')
-            limit = len(split)
-            flags = {}
-            for i in xrange(0, limit - 1):
-                current = split[i]
-                next = split[i + 1]
-                vindex = next.rfind(',')
-                if (i == limit - 2) or (vindex < 0):
-                    value = next
-                else:
-                    value = next[:vindex]
-
-                if i == 0:
-                    key = current
-                else:
-                    # if this not the first entry, expect an embedded key.
-                    index = current.rfind(',')
-                    if index < 0:
-                        log("invalid config value(s) at index %s" % (i),
-                            level=ERROR)
-                        raise OSContextError
-                    key = current[index + 1:]
-
-                # Add to collection.
-                flags[key.strip(post_strippers)] = value.rstrip(post_strippers)
-
+            flags = config_flags_parser(config_flags)
             return {'user_config_flags': flags}