Merge "Update the nova config reference"

doc/common/tables/nova-ca.xml

@@ -25,6 +25,10 @@
         <td><option>ca_path</option> = <replaceable>$state_path/CA</replaceable></td>
         <td>(StrOpt) Where we keep our root CA</td>
       </tr>
+      <tr>
+        <td><option>cert</option> = <replaceable>self.pem</replaceable></td>
+        <td>(StrOpt) SSL certificate file</td>
+      </tr>
       <tr>
         <td><option>cert_manager</option> = <replaceable>nova.cert.manager.CertManager</replaceable></td>
         <td>(StrOpt) Full class name for the Manager for cert</td>

doc/common/tables/nova-libvirt.xml

@@ -185,7 +185,7 @@
         <td>(IntOpt) Size in MiB to wipe at start of old volumes. 0 =&gt; all</td>
       </tr>
       <tr>
-        <td><option>volume_drivers</option> = <replaceable>iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver, iser=nova.virt.libvirt.volume.LibvirtISERVolumeDriver, local=nova.virt.libvirt.volume.LibvirtVolumeDriver, fake=nova.virt.libvirt.volume.LibvirtFakeVolumeDriver, rbd=nova.virt.libvirt.volume.LibvirtNetVolumeDriver, sheepdog=nova.virt.libvirt.volume.LibvirtNetVolumeDriver, nfs=nova.virt.libvirt.volume.LibvirtNFSVolumeDriver, smbfs=nova.virt.libvirt.volume.LibvirtSMBFSVolumeDriver, aoe=nova.virt.libvirt.volume.LibvirtAOEVolumeDriver, glusterfs=nova.virt.libvirt.volume.LibvirtGlusterfsVolumeDriver, fibre_channel=nova.virt.libvirt.volume.LibvirtFibreChannelVolumeDriver, scality=nova.virt.libvirt.volume.LibvirtScalityVolumeDriver</replaceable></td>
+        <td><option>volume_drivers</option> = <replaceable>iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver, iser=nova.virt.libvirt.volume.LibvirtISERVolumeDriver, local=nova.virt.libvirt.volume.LibvirtVolumeDriver, fake=nova.virt.libvirt.volume.LibvirtFakeVolumeDriver, rbd=nova.virt.libvirt.volume.LibvirtNetVolumeDriver, sheepdog=nova.virt.libvirt.volume.LibvirtNetVolumeDriver, nfs=nova.virt.libvirt.volume.LibvirtNFSVolumeDriver, smbfs=nova.virt.libvirt.volume.LibvirtSMBFSVolumeDriver, aoe=nova.virt.libvirt.volume.LibvirtAOEVolumeDriver, glusterfs=nova.virt.libvirt.volume.LibvirtGlusterfsVolumeDriver, fibre_channel=nova.virt.libvirt.volume.LibvirtFibreChannelVolumeDriver, scality=nova.virt.libvirt.volume.LibvirtScalityVolumeDriver, gpfs=nova.virt.libvirt.volume.LibvirtGPFSVolumeDriver</replaceable></td>
         <td>(ListOpt) DEPRECATED. Libvirt handlers for remote volumes. This option is deprecated and will be removed in the Kilo release.</td>
       </tr>
       <tr>

doc/common/tables/nova-policy.xml

@@ -55,7 +55,7 @@
       </tr>
       <tr>
         <td><option>policy_dirs</option> = <replaceable>['policy.d']</replaceable></td>
-        <td>(MultiStrOpt) Directories where policy configuration files are stored.</td>
+        <td>(MultiStrOpt) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched.</td>
       </tr>
       <tr>
         <td><option>policy_file</option> = <replaceable>policy.json</replaceable></td>

doc/common/tables/nova-spice.xml

@@ -29,6 +29,14 @@
         <td><option>html5proxy_base_url</option> = <replaceable>http://127.0.0.1:6082/spice_auto.html</replaceable></td>
         <td>(StrOpt) Location of spice HTML5 console proxy, in the form "http://127.0.0.1:6082/spice_auto.html"</td>
       </tr>
+      <tr>
+        <td><option>html5proxy_host</option> = <replaceable>0.0.0.0</replaceable></td>
+        <td>(StrOpt) Host on which to listen for incoming requests</td>
+      </tr>
+      <tr>
+        <td><option>html5proxy_port</option> = <replaceable>6082</replaceable></td>
+        <td>(IntOpt) Port on which to listen for incoming requests</td>
+      </tr>
       <tr>
         <td><option>keymap</option> = <replaceable>en-us</replaceable></td>
         <td>(StrOpt) Keymap for spice</td>

doc/common/tables/nova-vnc.xml

@@ -17,10 +17,30 @@
       <tr>
         <th colspan="2">[DEFAULT]</th>
       </tr>
+      <tr>
+        <td><option>daemon</option> = <replaceable>False</replaceable></td>
+        <td>(BoolOpt) Become a daemon (background process)</td>
+      </tr>
+      <tr>
+        <td><option>key</option> = <replaceable>None</replaceable></td>
+        <td>(StrOpt) SSL key file (if separate from cert)</td>
+      </tr>
       <tr>
         <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>record</option> = <replaceable>False</replaceable></td>
+        <td>(BoolOpt) Record sessions to FILE.[session_number]</td>
+      </tr>
+      <tr>
+        <td><option>source_is_ipv6</option> = <replaceable>False</replaceable></td>
+        <td>(BoolOpt) Source is ipv6</td>
+      </tr>
+      <tr>
+        <td><option>ssl_only</option> = <replaceable>False</replaceable></td>
+        <td>(BoolOpt) Disallow non-encrypted connections</td>
+      </tr>
       <tr>
         <td><option>vnc_enabled</option> = <replaceable>True</replaceable></td>
         <td>(BoolOpt) Enable VNC related features</td>
@@ -37,6 +57,10 @@
         <td><option>vncserver_proxyclient_address</option> = <replaceable>127.0.0.1</replaceable></td>
         <td>(StrOpt) The address to which proxy clients (like nova-xvpvncproxy) should connect</td>
       </tr>
+      <tr>
+        <td><option>web</option> = <replaceable>/usr/share/spice-html5</replaceable></td>
+        <td>(StrOpt) Run webserver on same port. Serve files from DIR.</td>
+      </tr>
       <tr>
         <th colspan="2">[vmware]</th>
       </tr>

tools/autogenerate-config-flagmappings/nova.flagmappings

@@ -20,6 +20,7 @@ boot_script_template vpn
 buckets_path s3
 ca_file ca
 ca_path ca
+cert ca
 cert_manager ca
 cert_topic ca
 client_socket_timeout api
@@ -50,6 +51,7 @@ control_exchange amqp
 cpu_allocation_ratio scheduler
 create_unique_mac_address_attempts network
 crl_file ca
+daemon vnc
 db_driver database
 debug logging
 default_access_ip_network_name network
@@ -136,6 +138,7 @@ iptables_top_regex network
 ipv6_backend ipv6
 isolated_hosts scheduler
 isolated_images scheduler
+key vnc
 key_file ca
 keys_path ca
 keystone_ec2_insecure ec2
@@ -278,6 +281,7 @@ ram_allocation_ratio scheduler
 ram_weight_multiplier scheduler
 reboot_timeout compute
 reclaim_instance_interval compute
+record vnc
 region_list ec2
 remove_unused_base_images libvirt
 remove_unused_original_minimum_age_seconds libvirt
@@ -338,9 +342,11 @@ shelved_offload_time compute
 shelved_poll_interval compute
 shutdown_timeout compute
 snapshot_name_template api
+source_is_ipv6 vnc
 ssl_ca_file ca
 ssl_cert_file ca
 ssl_key_file ca
+ssl_only vnc
 state_path common
 stub_compute xen
 sync_power_state_interval compute
@@ -383,6 +389,7 @@ vpn_image_id vpn
 vpn_ip vpn
 vpn_key_suffix vpn
 vpn_start vpn
+web vnc
 wsgi_default_pool_size api
 wsgi_keep_alive api
 wsgi_log_format api
@@ -625,6 +632,8 @@ serial_console/proxyclient_address serial_console
 spice/agent_enabled spice
 spice/enabled spice
 spice/html5proxy_base_url spice
+spice/html5proxy_host spice
+spice/html5proxy_port spice
 spice/keymap spice
 spice/server_listen spice
 spice/server_proxyclient_address spice