diff options
| author | Anup Navare <anup.d.navare@intel.com> | 2016-12-05 22:50:55 +0000 |
|---|---|---|
| committer | Anup Navare <anup.d.navare@intel.com> | 2017-04-12 17:21:50 +0000 |
| commit | 58b34b0b3002cd5bc355bfb0e6f5406004a4da41 (patch) | |
| tree | 544d9674315fa149b22d2e1a713257bc021d7b48 /ironic/conf/conductor.py | |
| parent | 8aec5fb6a579e1471265beb044fde92755d6e5a1 (diff) | |
| download | ironic-58b34b0b3002cd5bc355bfb0e6f5406004a4da41.tar.gz | |
Config drive support for ceph radosgw
Currently config drive can be stored in swift with keystone
authentication. This change allows ironic to store the config drive in
ceph radosgw and use radosgw authentication mechanism that is not
currently supported. It uses swift API compatibility for ceph radosgw.
New options:
[deploy]/configdrive_use_object_store
[deploy]/object_store_endpoint_type
Deprecations:
[conductor]/configdrive_use_swift
Replaced by: [deploy]/configdrive_use_object_store
[glance]/temp_url_endpoint_type
Replaced by: [deploy]/object_store_endpoint_type
Change-Id: I9204c718505376cfb73632b0d0f31cea00d5e4d8
Closes-Bug: #1642719
Diffstat (limited to 'ironic/conf/conductor.py')
| -rw-r--r-- | ironic/conf/conductor.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ironic/conf/conductor.py b/ironic/conf/conductor.py index 01b6c37a1..a9846b088 100644 --- a/ironic/conf/conductor.py +++ b/ironic/conf/conductor.py @@ -107,13 +107,11 @@ opts = [ 'conductor will check for nodes that it should ' '"take over". Set it to a negative value to disable ' 'the check entirely.')), - cfg.BoolOpt('configdrive_use_swift', - default=False, - help=_('Whether to upload the config drive to Swift.')), cfg.StrOpt('configdrive_swift_container', default='ironic_configdrive_container', help=_('Name of the Swift container to store config drive ' - 'data. Used when configdrive_use_swift is True.')), + 'data. Used when configdrive_use_object_store is ' + 'True.')), cfg.IntOpt('inspect_timeout', default=1800, help=_('Timeout (seconds) for waiting for node inspection. ' |