diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-11-27 10:00:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-11-27 10:00:04 +0000 |
| commit | 9bc8279fa5a2dfc129f3cf5d049896d00babd4ca (patch) | |
| tree | b7a8308929db28111d5f14e2f34dd1953557453d /ironic | |
| parent | 6cd7b5b06a09410fe38924a739cc49df411782c9 (diff) | |
| parent | ba2db8631f7f44b7fe753ecdf49ddbca4a21f811 (diff) | |
| download | ironic-9bc8279fa5a2dfc129f3cf5d049896d00babd4ca.tar.gz | |
Merge "Add tftp_server pattern in ironic.conf"
Diffstat (limited to 'ironic')
| -rw-r--r-- | ironic/drivers/modules/pxe.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ironic/drivers/modules/pxe.py b/ironic/drivers/modules/pxe.py index e1df497d8..f1fdbaa18 100644 --- a/ironic/drivers/modules/pxe.py +++ b/ironic/drivers/modules/pxe.py @@ -58,6 +58,11 @@ pxe_opts = [ cfg.IntOpt('pxe_deploy_timeout', help='Timeout for PXE deployments. Default: 0 (unlimited)', default=0), + # TODO(sjing): when adding neutron-port configuration, use this option + # instead of assuming tftp server is on $my_ip + cfg.StrOpt('tftp_server', + default='$my_ip', + help='IP address of Ironic compute node\'s tftp server'), cfg.StrOpt('tftp_root', default='/tftpboot', help='Ironic compute node\'s tftp root path'), |