Disable ConfigParser interpolation (lp#930270)

This breaks e.g.

  volume_name_template=volume-%08x
  instance_name_template=instance-%08x

and is not part of the API contract anyway. We use $opt based value
interpolation.

Change-Id: I7ba566ae7c9a77322b52c67c5e1ffbffb760f0fc

2 files changed, 13 insertions, 1 deletions

diff --git a/openstack/common/cfg.py b/openstack/common/cfg.py
index 2562af4..23b6773 100644
--- a/openstack/common/cfg.py
+++ b/openstack/common/cfg.py
@@ -435,7 +435,7 @@ class Opt(object):
         :param cparser: a ConfigParser object
         :param section: a section name
         """
-        return cparser.get(section, self.dest)
+        return cparser.get(section, self.dest, raw=True)
 
     def _add_to_cli(self, parser, group=None):
         """Makes the option available in the command line interface.
diff --git a/tests/unit/test_cfg.py b/tests/unit/test_cfg.py
index c93f444..8dd6352 100644
--- a/tests/unit/test_cfg.py
+++ b/tests/unit/test_cfg.py
@@ -469,6 +469,18 @@ class ConfigFileOptsTestCase(BaseTestCase):
         self.assertTrue(hasattr(self.conf, 'bar'))
         self.assertEquals(self.conf.bar, 'foo')
 
+    def test_conf_file_raw_value(self):
+        self.conf.register_opt(StrOpt('foo'))
+
+        paths = self.create_tempfiles([('test.conf',
+                                        '[DEFAULT]\n'
+                                        'foo = bar-%08x\n')])
+
+        self.conf(['--config-file', paths[0]])
+
+        self.assertTrue(hasattr(self.conf, 'foo'))
+        self.assertEquals(self.conf.foo, 'bar-%08x')
+
 
 class OptGroupsTestCase(BaseTestCase):