diff options
| author | Devananda van der Veen <devananda.vdv@gmail.com> | 2013-11-27 12:19:43 -0800 |
|---|---|---|
| committer | Devananda van der Veen <devananda.vdv@gmail.com> | 2013-12-03 12:07:18 -0800 |
| commit | 1d861582167758caa03212a5475ab2c2407882f2 (patch) | |
| tree | 2d365fc516ce3c858815ea8c4d947eb9689e3eb8 /etc | |
| parent | 025aad65fef629ccb09357bc3484b2d45a80ed48 (diff) | |
| download | ironic-1d861582167758caa03212a5475ab2c2407882f2.tar.gz | |
Add heartbeat_interval to new 'conductor' cfg group
Add new 'conductor' config option group, to separate the various options
specific to this service which will be added in subsequent patches.
Add heartbeat_interval option to control how often a conductor updates
its status record in the database.
Fix a minor issue with the unit test associated with this method
and rename it to be more consistent with other unit test names.
Change-Id: I0ea71231ba7a6f20b94f4bca7de2a2f49bc4a428
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ironic/ironic.conf.sample | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index 4b3a60a19..a7cba89ad 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -417,12 +417,19 @@ [conductor] # -# Options defined in ironic.conductor.rpcapi +# Options defined in ironic.conductor.manager # -# Maximum time, in seconds, since the last check-in of a -# conductor (integer value) -#max_time_interval=120 +# Url of Ironic API service. If not set Ironic can get current +# value from Keystone service catalog. (string value) +#api_url=<None> + +# Seconds between conductor heart beats. (integer value) +#heartbeat_interval=10 + +# Maximum time since the last check-in of a conductor (integer +# value) +#heartbeat_timeout=60 [database] |