Move intervals config one level up
Makes for a slightly-better-organized configuration and explanation.
This commit is contained in:
parent
0d79def842
commit
83b806d0b5
|
@ -78,9 +78,7 @@ pvc:
|
||||||
pass: pvcdns
|
pass: pvcdns
|
||||||
# system: Local PVC instance configuration
|
# system: Local PVC instance configuration
|
||||||
system:
|
system:
|
||||||
# fencing: Node fencing configuration
|
# intervals: Intervals for keepalives and fencing
|
||||||
fencing:
|
|
||||||
# intervals: Intervals for fencing determination
|
|
||||||
intervals:
|
intervals:
|
||||||
# keepalive_interval: Number of seconds between keepalive/status updates
|
# keepalive_interval: Number of seconds between keepalive/status updates
|
||||||
keepalive_interval: 5
|
keepalive_interval: 5
|
||||||
|
@ -88,6 +86,8 @@ pvc:
|
||||||
fence_intervals: 6
|
fence_intervals: 6
|
||||||
# suicide_intervals: Numer of keepalive_intervals before a node considers itself dead and self-fences, 0 to disable
|
# suicide_intervals: Numer of keepalive_intervals before a node considers itself dead and self-fences, 0 to disable
|
||||||
suicide_intervals: 0
|
suicide_intervals: 0
|
||||||
|
# fencing: Node fencing configuration
|
||||||
|
fencing:
|
||||||
# actions: Actions to take after a fence trigger
|
# actions: Actions to take after a fence trigger
|
||||||
actions:
|
actions:
|
||||||
# successful_fence: Action to take after successfully fencing a node, options: migrate, None
|
# successful_fence: Action to take after successfully fencing a node, options: migrate, None
|
||||||
|
|
|
@ -149,9 +149,9 @@ def readConfig(pvcd_config_file, myhostname):
|
||||||
'log_keepalive_cluster_details': o_config['pvc']['system']['configuration']['logging']['log_keepalive_cluster_details'],
|
'log_keepalive_cluster_details': o_config['pvc']['system']['configuration']['logging']['log_keepalive_cluster_details'],
|
||||||
'log_keepalive_storage_details': o_config['pvc']['system']['configuration']['logging']['log_keepalive_storage_details'],
|
'log_keepalive_storage_details': o_config['pvc']['system']['configuration']['logging']['log_keepalive_storage_details'],
|
||||||
'console_log_lines': o_config['pvc']['system']['configuration']['logging']['console_log_lines'],
|
'console_log_lines': o_config['pvc']['system']['configuration']['logging']['console_log_lines'],
|
||||||
'keepalive_interval': o_config['pvc']['system']['fencing']['intervals']['keepalive_interval'],
|
'keepalive_interval': o_config['pvc']['system']['intervals']['keepalive_interval'],
|
||||||
'fence_intervals': o_config['pvc']['system']['fencing']['intervals']['fence_intervals'],
|
'fence_intervals': o_config['pvc']['system']['intervals']['fence_intervals'],
|
||||||
'suicide_intervals': o_config['pvc']['system']['fencing']['intervals']['suicide_intervals'],
|
'suicide_intervals': o_config['pvc']['system']['intervals']['suicide_intervals'],
|
||||||
'successful_fence': o_config['pvc']['system']['fencing']['actions']['successful_fence'],
|
'successful_fence': o_config['pvc']['system']['fencing']['actions']['successful_fence'],
|
||||||
'failed_fence': o_config['pvc']['system']['fencing']['actions']['failed_fence'],
|
'failed_fence': o_config['pvc']['system']['fencing']['actions']['failed_fence'],
|
||||||
'migration_target_selector': o_config['pvc']['system']['migration']['target_selector'],
|
'migration_target_selector': o_config['pvc']['system']['migration']['target_selector'],
|
||||||
|
|
Loading…
Reference in New Issue