options.py (manila-8.1.3) | : | options.py (manila-8.1.4) | ||
---|---|---|---|---|
skipping to change at line 153 | skipping to change at line 153 | |||
min=0, | min=0, | |||
default=3600, # One Hour | default=3600, # One Hour | |||
help='The maximum time in seconds to wait for existing ' | help='The maximum time in seconds to wait for existing ' | |||
'snapmirror transfers to complete before aborting when ' | 'snapmirror transfers to complete before aborting when ' | |||
'promoting a replica.'), | 'promoting a replica.'), | |||
cfg.IntOpt('netapp_volume_move_cutover_timeout', | cfg.IntOpt('netapp_volume_move_cutover_timeout', | |||
min=0, | min=0, | |||
default=3600, # One Hour, | default=3600, # One Hour, | |||
help='The maximum time in seconds to wait for the completion ' | help='The maximum time in seconds to wait for the completion ' | |||
'of a volume move operation after the cutover ' | 'of a volume move operation after the cutover ' | |||
'was triggered.'), ] | 'was triggered.'), | |||
cfg.IntOpt('netapp_migration_cancel_timeout', | ||||
min=0, | ||||
default=3600, # One Hour, | ||||
help='The maximum time in seconds that migration cancel ' | ||||
'waits for all migration operations be completely ' | ||||
'aborted.'), ] | ||||
CONF = cfg.CONF | CONF = cfg.CONF | |||
CONF.register_opts(netapp_proxy_opts) | CONF.register_opts(netapp_proxy_opts) | |||
CONF.register_opts(netapp_connection_opts) | CONF.register_opts(netapp_connection_opts) | |||
CONF.register_opts(netapp_transport_opts) | CONF.register_opts(netapp_transport_opts) | |||
CONF.register_opts(netapp_basicauth_opts) | CONF.register_opts(netapp_basicauth_opts) | |||
CONF.register_opts(netapp_provisioning_opts) | CONF.register_opts(netapp_provisioning_opts) | |||
CONF.register_opts(netapp_support_opts) | CONF.register_opts(netapp_support_opts) | |||
CONF.register_opts(netapp_data_motion_opts) | CONF.register_opts(netapp_data_motion_opts) | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 7 lines changed or added |