diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-01-15 14:02:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-01-15 14:02:58 +0000 |
| commit | 80904f91014ce4d4619a92402302646dc273551a (patch) | |
| tree | a38d626d817a910823ba2f94deeec31234ca8abb | |
| parent | 828948c7580a25bfce374004d2298ddb1fc737f6 (diff) | |
| parent | 6bee1a5dd7ed0f3ee47304b939f347dd566e9ca9 (diff) | |
| download | ironic-80904f91014ce4d4619a92402302646dc273551a.tar.gz | |
Merge "Enable $pybasedir value in pxe.py"
| -rw-r--r-- | etc/ironic/ironic.conf.sample | 8 | ||||
| -rw-r--r-- | ironic/common/paths.py | 6 | ||||
| -rw-r--r-- | ironic/drivers/modules/pxe.py | 7 |
3 files changed, 11 insertions, 10 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index 6cc2c87c5..a07d102c2 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -58,14 +58,14 @@ # Options defined in ironic.common.paths # -# Directory where the nova python module is installed (string -# value) +# Directory where the ironic python module is installed +# (string value) #pybasedir=/usr/lib/python/site-packages/ironic -# Directory where nova binaries are installed (string value) +# Directory where ironic binaries are installed (string value) #bindir=$pybasedir/bin -# Top-level directory for maintaining nova's state (string +# Top-level directory for maintaining ironic's state (string # value) #state_path=$pybasedir 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 diff --git a/ironic/drivers/modules/pxe.py b/ironic/drivers/modules/pxe.py index 4d69a7682..ac04f1ab8 100644 --- a/ironic/drivers/modules/pxe.py +++ b/ironic/drivers/modules/pxe.py @@ -29,6 +29,7 @@ from ironic.common.glance_service import service_utils from ironic.common import image_service as service from ironic.common import images from ironic.common import keystone +from ironic.common import paths from ironic.common import states from ironic.common import utils from ironic.conductor import task_manager @@ -40,20 +41,20 @@ from ironic.openstack.common import lockutils from ironic.openstack.common import log as logging from ironic.openstack.common import loopingcall - pxe_opts = [ cfg.StrOpt('deploy_kernel', help='Default kernel image ID used in deployment phase'), cfg.StrOpt('deploy_ramdisk', help='Default ramdisk image ID used in deployment phase'), cfg.StrOpt('net_config_template', - default='$pybasedir/ironic/net-dhcp.ubuntu.template', + default=paths.basedir_def('ironic/net-dhcp.ubuntu.template'), help='Template file for injected network config'), cfg.StrOpt('pxe_append_params', default='nofb nomodeset vga=normal', help='additional append parameters for baremetal PXE boot'), cfg.StrOpt('pxe_config_template', - default='$pybasedir/drivers/modules/pxe_config.template', + default=paths.basedir_def( + 'drivers/modules/pxe_config.template'), help='Template file for PXE configuration'), cfg.IntOpt('pxe_deploy_timeout', help='Timeout for PXE deployments. Default: 0 (unlimited)', |