Merge "Update nova reference tables"

This commit is contained in:
Jenkins 2015-02-20 15:53:32 +00:00 committed by Gerrit Code Review
commit 9e2e7a74aa
3 changed files with 20 additions and 0 deletions

View File

@ -37,6 +37,14 @@
<td><option>proxyclient_address</option> = <replaceable>127.0.0.1</replaceable></td>
<td>(StrOpt) The address to which proxy clients (like nova-serialproxy) should connect</td>
</tr>
<tr>
<td><option>serialproxy_host</option> = <replaceable>0.0.0.0</replaceable></td>
<td>(StrOpt) Host on which to listen for incoming requests</td>
</tr>
<tr>
<td><option>serialproxy_port</option> = <replaceable>6083</replaceable></td>
<td>(IntOpt) Port on which to listen for incoming requests</td>
</tr>
</tbody>
</table>
</para>

View File

@ -29,6 +29,14 @@
<td><option>novncproxy_base_url</option> = <replaceable>http://127.0.0.1:6080/vnc_auto.html</replaceable></td>
<td>(StrOpt) Location of VNC console proxy, in the form "http://127.0.0.1:6080/vnc_auto.html"</td>
</tr>
<tr>
<td><option>novncproxy_host</option> = <replaceable>0.0.0.0</replaceable></td>
<td>(StrOpt) Host on which to listen for incoming requests</td>
</tr>
<tr>
<td><option>novncproxy_port</option> = <replaceable>6080</replaceable></td>
<td>(IntOpt) Port on which to listen for incoming requests</td>
</tr>
<tr>
<td><option>record</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Record sessions to FILE.[session_number]</td>

View File

@ -213,6 +213,8 @@ notification_topics amqp
notify_api_faults common
notify_on_state_change common
novncproxy_base_url vnc
novncproxy_host vnc
novncproxy_port vnc
null_kernel api
num_networks network
osapi_compute_ext_list api
@ -651,6 +653,8 @@ serial_console/enabled serial_console
serial_console/listen serial_console
serial_console/port_range serial_console
serial_console/proxyclient_address serial_console
serial_console/serialproxy_host serial_console
serial_console/serialproxy_port serial_console
spice/agent_enabled spice
spice/enabled spice
spice/html5proxy_base_url spice