Merge branch 'master' of https://github.com/yahoo/Openstack-DevstackPy

devstack/cfg.py

@@ -40,47 +40,7 @@ PW_PROMPTS = {
 }
 
 
-class IgnoreMissingConfigParser(ConfigParser.RawConfigParser):
+class StackConfigParser(ConfigParser.RawConfigParser):
-    DEF_INT = 0
-    DEF_FLOAT = 0.0
-    DEF_BOOLEAN = False
-
-    def __init__(self):
-        ConfigParser.RawConfigParser.__init__(self)
-
-    def get(self, section, option):
-        value = None
-        try:
-            value = ConfigParser.RawConfigParser.get(self, section, option)
-        except ConfigParser.NoSectionError, e:
-            pass
-        except ConfigParser.NoOptionError, e:
-            pass
-        return value
-
-    def getboolean(self, section, option):
-        value = self.get(section, option)
-        if value is None:
-            #not there so don't let the parent blowup
-            return IgnoreMissingConfigParser.DEF_BOOLEAN
-        return ConfigParser.RawConfigParser.getboolean(self, section, option)
-
-    def getfloat(self, section, option):
-        value = self.get(section, option)
-        if value is None:
-            #not there so don't let the parent blowup
-            return IgnoreMissingConfigParser.DEF_FLOAT
-        return ConfigParser.RawConfigParser.getfloat(self, section, option)
-
-    def getint(self, section, option):
-        value = self.get(section, option)
-        if value is None:
-            #not there so don't let the parent blowup
-            return IgnoreMissingConfigParser.DEF_INT
-        return ConfigParser.RawConfigParser.getint(self, section, option)
-
-
-class EnvConfigParser(ConfigParser.RawConfigParser):
     def __init__(self):
         ConfigParser.RawConfigParser.__init__(self)
         self.pws = dict()
@@ -207,3 +167,45 @@ class EnvConfigParser(ConfigParser.RawConfigParser):
         #store for later...
         self.db_dsns[dbname] = dsn
         return dsn
+
+
+class IgnoreMissingConfigParser(ConfigParser.RawConfigParser):
+    DEF_INT = 0
+    DEF_FLOAT = 0.0
+    DEF_BOOLEAN = False
+
+    def __init__(self):
+        ConfigParser.RawConfigParser.__init__(self)
+        #make option names case sensitive
+        self.optionxform = str
+
+    def get(self, section, option):
+        value = None
+        try:
+            value = ConfigParser.RawConfigParser.get(self, section, option)
+        except ConfigParser.NoSectionError, e:
+            pass
+        except ConfigParser.NoOptionError, e:
+            pass
+        return value
+
+    def getboolean(self, section, option):
+        value = self.get(section, option)
+        if value is None:
+            #not there so don't let the parent blowup
+            return IgnoreMissingConfigParser.DEF_BOOLEAN
+        return ConfigParser.RawConfigParser.getboolean(self, section, option)
+
+    def getfloat(self, section, option):
+        value = self.get(section, option)
+        if value is None:
+            #not there so don't let the parent blowup
+            return IgnoreMissingConfigParser.DEF_FLOAT
+        return ConfigParser.RawConfigParser.getfloat(self, section, option)
+
+    def getint(self, section, option):
+        value = self.get(section, option)
+        if value is None:
+            #not there so don't let the parent blowup
+            return IgnoreMissingConfigParser.DEF_INT
+        return ConfigParser.RawConfigParser.getint(self, section, option)

devstack/components/glance.py

@@ -121,9 +121,6 @@ class GlanceInstaller(comp.PythonInstallComponent):
         #then extract known configs that
         #will need locations/directories/files made (or touched)...
         with io.BytesIO(contents) as stream:
-            #for paste files we might not be doing this 100% right
-            #since it seems like the paste config format is not the same as
-            #the python config parser format....
             config = cfg.IgnoreMissingConfigParser()
             config.readfp(stream)
             if config.getboolean('image_cache_enabled', CFG_SECTION):

devstack/components/keystone.py

@@ -137,9 +137,6 @@ class KeystoneInstaller(comp.PythonInstallComponent):
         #then extract known configs that
         #will need locations/directories/files made (or touched)...
         with io.BytesIO(contents) as stream:
-            #for paste files we might not be doing this 100% right
-            #since it seems like the paste config format is not the same as
-            #the python config parser format....
             config = cfg.IgnoreMissingConfigParser()
             config.readfp(stream)
             log_filename = config.get('log_file', CFG_SECTION)

devstack/components/nova.py

@@ -324,10 +324,25 @@ class NovaInstaller(comp.PythonInstallComponent):
 
     def _config_adjust(self, contents, config_fn):
         if config_fn == PASTE_CONF and settings.KEYSTONE in self.instances:
-            #it seems like paste actually uses it own custom config parser
+            newcontents = contents
-            #which looks like the python config parser files format but actually isn't
+            with io.BytesIO(contents) as stream:
-            #great (not)
+                config = cfg.IgnoreMissingConfigParser()
-            contents = utils.adjust_paste_config(contents, PASTE_PIPELINE_KEYSTONE_ADJUST)
+                config.readfp(stream)
+                mods = 0
+                for section in PASTE_PIPELINE_KEYSTONE_ADJUST.keys():
+                    if config.has_section(section):
+                        section_vals = PASTE_PIPELINE_KEYSTONE_ADJUST.get(section)
+                        for (k, v) in section_vals.items():
+                            config.set(section, k, v)
+                            mods += 1
+                if mods > 0:
+                    with io.BytesIO() as outputstream:
+                        config.write(outputstream)
+                        outputstream.flush()
+                        #TODO can we write to contents here directly?
+                        new_data = ['# Adjusted %s' % (config_fn), outputstream.getvalue()]
+                        newcontents = utils.joinlinesep(*new_data)
+            contents = newcontents
         return contents
 
     def _get_source_config(self, config_fn):

devstack/components/swift_keystone.py

@@ -61,10 +61,10 @@ class SwiftKeystoneInstaller(comp.PythonInstallComponent):
             }]
 
     def _get_config_files(self):
-        return CONFIGS
+        return list(CONFIGS)
 
     def _get_pkgs(self):
-        return REQ_PKGS
+        return list(REQ_PKGS)
 
     def _post_install(self):
         pass

devstack/progs/common.py

@@ -136,7 +136,7 @@ def get_action_cls(action_name, component_name):
 
 def get_config():
     cfg_fn = sh.canon_path(settings.STACK_CONFIG_LOCATION)
-    config_instance = cfg.EnvConfigParser()
+    config_instance = cfg.StackConfigParser()
     config_instance.read(cfg_fn)
     return config_instance
 

devstack/utils.py

@@ -45,38 +45,6 @@ def load_template(component, fn):
     return (full_pth, contents)
 
 
-def adjust_paste_config(contents, section_rep):
-    lines = contents.splitlines()
-    for section in section_rep.keys():
-        section_str = "[" + section.strip() + "]"
-        section_replacements = section_rep.get(section)
-        if not section_replacements:
-            continue
-        LOG.debug("Looking for section %s" % (section))
-        matching = False
-        for i in range(len(lines)):
-            line = lines[i]
-            if matching and line.startswith("["):
-                #new section
-                LOG.debug("Finished section named %s ending at line %s" % (section, (i + 1)))
-                break
-            elif matching:
-                for (key, rep) in section_replacements.items():
-                    #does not handle multi-lines values (fix that?)
-                    pieces = line.split("=", 1)
-                    if len(pieces) == 2:
-                        pot_key = pieces[0].strip()
-                        if pot_key == key:
-                            new_line = "%s = %s" % (key, rep)
-                            LOG.debug("Replacing paste line %s with %s for line %s" % (line, new_line, (i + 1)))
-                            lines[i] = new_line
-            elif not matching and section_str == line.strip():
-                #found the section
-                matching = True
-                LOG.debug("Found section named %s starting at line %s" % (section, (i + 1)))
-    return joinlinesep(*lines)
-
-
 def execute_template(*cmds, **kargs):
     params_replacements = kargs.pop('params', None)
     tracewriter = kargs.pop('tracewriter', None)