summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xopenstack/common/config/generator.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/openstack/common/config/generator.py b/openstack/common/config/generator.py
index 4251c87..5d4e005 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