diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-12 18:33:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-12 18:33:58 +0000 |
| commit | f9cc093ab6c3f34bd2f3bceb831ba6b937704a54 (patch) | |
| tree | 2d9b80baecfe82980647d2eeee898c12870c0462 | |
| parent | 151d027b2002c5d9b188006ef05515c615d72419 (diff) | |
| parent | adff2ccbf346645e8105c82ac39410459f2ac303 (diff) | |
| download | oslo-f9cc093ab6c3f34bd2f3bceb831ba6b937704a54.tar.gz oslo-f9cc093ab6c3f34bd2f3bceb831ba6b937704a54.tar.xz oslo-f9cc093ab6c3f34bd2f3bceb831ba6b937704a54.zip | |
Merge "Fix workarounds for some values"
| -rwxr-xr-x | openstack/common/config/generator.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/openstack/common/config/generator.py b/openstack/common/config/generator.py index 3f66f74..09649e7 100755 --- a/openstack/common/config/generator.py +++ b/openstack/common/config/generator.py @@ -56,7 +56,8 @@ OPTION_REGEX = re.compile(r"(%s)" % "|".join([STROPT, BOOLOPT, INTOPT, MULTISTROPT])) PY_EXT = ".py" -BASEDIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../")) +BASEDIR = os.path.abspath(os.path.join(os.path.dirname(__file__), + "../../../../")) WORDWRAP_WIDTH = 60 @@ -193,7 +194,7 @@ def _sanitize_default(s): return s.replace(BASEDIR, '') elif s == _get_my_ip(): return '10.0.0.1' - elif s == socket.getfqdn(): + elif s == socket.gethostname(): return 'oslo' elif s.strip() != s: return '"%s"' % s |