openstack/openstack-manuals
Code Issues Proposed changes

Merge "Fix hw_watchdog_action syntax"

Browse Source
This commit is contained in:
Jenkins
2014-11-02 06:52:55 +00:00
committed by Gerrit Code Review
parent ed0ba217c1 ba2fa4c857
commit 6254b9abfe
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/cli-reference/ch_cli_glance_property_keys.xml
View File

@@ -306,10 +306,10 @@
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td>libvirt API driver</td> <td>libvirt API driver</td>
<td>hw_watchdog_action</td> <td>hw:watchdog_action</td>
<td>Enables a virtual hardware watchdog device that carries out the specified action <td>Enables a virtual hardware watchdog device that carries out the specified action
if the server hangs. The watchdog uses the i6300esb device (emulating a PCI if the server hangs. The watchdog uses the i6300esb device (emulating a PCI
Intel 6300ESB). If <literal>hw_watchdog_action</literal> is not specified, the Intel 6300ESB). If <literal>hw:watchdog_action</literal> is not specified, the
watchdog is disabled.</td> watchdog is disabled.</td>
<td><itemizedlist> <td><itemizedlist>
<listitem><para><literal>disabled</literal>&mdash;(default) The device is not <listitem><para><literal>disabled</literal>&mdash;(default) The device is not

4
doc/common/section_cli_nova_customize_flavors.xml
View File

@@ -275,10 +275,10 @@
out the configured action, if the server hangs. out the configured action, if the server hangs.
The watchdog uses the i6300esb device (emulating a The watchdog uses the i6300esb device (emulating a
PCI Intel 6300ESB). If PCI Intel 6300ESB). If
<literal>hw_watchdog_action</literal> is not <literal>hw:watchdog_action</literal> is not
specified, the watchdog is disabled.</para> specified, the watchdog is disabled.</para>
<para>To set the behavior, use:</para> <para>To set the behavior, use:</para>
<screen><prompt>$</prompt> <userinput>nova flavor-key <replaceable>FLAVOR-NAME</replaceable> set driver:hw_watchdog_action=<replaceable>ACTION</replaceable></userinput></screen> <screen><prompt>$</prompt> <userinput>nova flavor-key <replaceable>FLAVOR-NAME</replaceable> set hw:watchdog_action=<replaceable>ACTION</replaceable></userinput></screen>
<para>Valid <replaceable>ACTION</replaceable> values <para>Valid <replaceable>ACTION</replaceable> values
are:</para> are:</para>
<itemizedlist> <itemizedlist>