From 89b0c506f45b2837882165a5bfe7982ba3d8667c Mon Sep 17 00:00:00 2001
From: Gauvain Pocentek <gauvain.pocentek@objectif-libre.com>
Date: Thu, 19 Feb 2015 21:14:33 +0100
Subject: [PATCH] Update nova reference tables

Change-Id: I004a7280ba686028bc5afab754cdb01e58d8a1fe
Closes-Bug: #1363954
---
 doc/common/tables/nova-serial_console.xml                | 8 ++++++++
 doc/common/tables/nova-vnc.xml                           | 8 ++++++++
 tools/autogenerate-config-flagmappings/nova.flagmappings | 4 ++++
 3 files changed, 20 insertions(+)

diff --git a/doc/common/tables/nova-serial_console.xml b/doc/common/tables/nova-serial_console.xml
index 46f09a7914..a500df363d 100644
--- a/doc/common/tables/nova-serial_console.xml
+++ b/doc/common/tables/nova-serial_console.xml
@@ -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>
diff --git a/doc/common/tables/nova-vnc.xml b/doc/common/tables/nova-vnc.xml
index 4a2a47b0c1..6e23355d6c 100644
--- a/doc/common/tables/nova-vnc.xml
+++ b/doc/common/tables/nova-vnc.xml
@@ -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>
diff --git a/tools/autogenerate-config-flagmappings/nova.flagmappings b/tools/autogenerate-config-flagmappings/nova.flagmappings
index 21cb33b4b2..839f4f9b50 100644
--- a/tools/autogenerate-config-flagmappings/nova.flagmappings
+++ b/tools/autogenerate-config-flagmappings/nova.flagmappings
@@ -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