diff options
Diffstat (limited to 'ironic/conf')
| -rw-r--r-- | ironic/conf/agent.py | 13 | ||||
| -rw-r--r-- | ironic/conf/deploy.py | 7 |
2 files changed, 20 insertions, 0 deletions
diff --git a/ironic/conf/agent.py b/ironic/conf/agent.py index 3348c0341..57bdc7206 100644 --- a/ironic/conf/agent.py +++ b/ironic/conf/agent.py @@ -89,6 +89,19 @@ opts = [ 'forever or until manually deleted. Used when the ' 'deploy_logs_storage_backend is configured to ' '"swift".')), + cfg.StrOpt('image_download_source', + choices=[('swift', _('IPA ramdisk retrieves instance image ' + 'from the Object Storage service.')), + ('http', _('IPA ramdisk retrieves instance image ' + 'from HTTP service served at conductor ' + 'nodes.'))], + default='swift', + help=_('Specifies whether direct deploy interface should try ' + 'to use the image source directly or if ironic should ' + 'cache the image on the conductor and serve it from ' + 'ironic\'s own http server. This option takes effect ' + 'only when instance image is provided from the Image ' + 'service.')), ] diff --git a/ironic/conf/deploy.py b/ironic/conf/deploy.py index 780792bb5..0c763fd75 100644 --- a/ironic/conf/deploy.py +++ b/ironic/conf/deploy.py @@ -96,6 +96,13 @@ opts = [ help=_('Whether to upload the config drive to object store. ' 'Set this option to True to store config drive ' 'in a swift endpoint.')), + cfg.StrOpt('http_image_subdir', + default='agent_images', + help=_('The name of subdirectory under ironic-conductor ' + 'node\'s HTTP root path which is used to place instance ' + 'images for the direct deploy interface, when local ' + 'HTTP service is incorporated to provide instance image ' + 'instead of swift tempurls.')), ] |