diff options
| author | Haomeng, Wang <whaom@cn.ibm.com> | 2014-01-09 13:23:03 +0800 |
|---|---|---|
| committer | Haomeng, Wang <whaom@cn.ibm.com> | 2014-01-09 15:05:37 +0800 |
| commit | 6bee1a5dd7ed0f3ee47304b939f347dd566e9ca9 (patch) | |
| tree | a11f683a2a97b938e51d1c41824f435c48c1d5b3 /ironic/common/paths.py | |
| parent | 2c66d3cb6637a0ea5224a0edd2fe5960cd958409 (diff) | |
| download | ironic-6bee1a5dd7ed0f3ee47304b939f347dd566e9ca9.tar.gz | |
Enable $pybasedir value in pxe.py
We should not refer $pybasedir directly in our python code, because
it is loaded by paths.py, we should use paths.basedir_def("") to load
this $pybasedir value as a base path.
And change some 'nova' words to 'ironic in paths.py
Change-Id: I4c6bcb103d4d1eee8e7bf78f46c815630666cfe9
Closes-Bug: #1267351
Diffstat (limited to 'ironic/common/paths.py')
| -rw-r--r-- | ironic/common/paths.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ironic/common/paths.py b/ironic/common/paths.py index 8d84289ae..35659762d 100644 --- a/ironic/common/paths.py +++ b/ironic/common/paths.py @@ -25,13 +25,13 @@ path_opts = [ cfg.StrOpt('pybasedir', default=os.path.abspath(os.path.join(os.path.dirname(__file__), '../')), - help='Directory where the nova python module is installed'), + help='Directory where the ironic python module is installed'), cfg.StrOpt('bindir', default='$pybasedir/bin', - help='Directory where nova binaries are installed'), + help='Directory where ironic binaries are installed'), cfg.StrOpt('state_path', default='$pybasedir', - help="Top-level directory for maintaining nova's state"), + help="Top-level directory for maintaining ironic's state"), ] CONF = cfg.CONF |