From c5695501a8b70fc33c6fd435e465a5bc35cd2ac7 Mon Sep 17 00:00:00 2001 From: Gauvain Pocentek Date: Tue, 20 Jan 2015 18:05:03 +0100 Subject: [PATCH] Update the nova config reference Change-Id: If404beb5c0046364cdab1220abf1e850fc263745 Closes-Bug: #1394595 --- doc/common/tables/nova-ca.xml | 4 ++++ doc/common/tables/nova-libvirt.xml | 2 +- doc/common/tables/nova-policy.xml | 2 +- doc/common/tables/nova-spice.xml | 8 +++++++ doc/common/tables/nova-vnc.xml | 24 +++++++++++++++++++ .../nova.flagmappings | 9 +++++++ 6 files changed, 47 insertions(+), 2 deletions(-) diff --git a/doc/common/tables/nova-ca.xml b/doc/common/tables/nova-ca.xml index 1884024e35..d09e249459 100644 --- a/doc/common/tables/nova-ca.xml +++ b/doc/common/tables/nova-ca.xml @@ -25,6 +25,10 @@ = $state_path/CA (StrOpt) Where we keep our root CA + + = self.pem + (StrOpt) SSL certificate file + = nova.cert.manager.CertManager (StrOpt) Full class name for the Manager for cert diff --git a/doc/common/tables/nova-libvirt.xml b/doc/common/tables/nova-libvirt.xml index 8b32b446de..15a04d1dce 100644 --- a/doc/common/tables/nova-libvirt.xml +++ b/doc/common/tables/nova-libvirt.xml @@ -185,7 +185,7 @@ (IntOpt) Size in MiB to wipe at start of old volumes. 0 => all - = 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 + = 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 (ListOpt) DEPRECATED. Libvirt handlers for remote volumes. This option is deprecated and will be removed in the Kilo release. diff --git a/doc/common/tables/nova-policy.xml b/doc/common/tables/nova-policy.xml index 310530d9af..415812c58a 100644 --- a/doc/common/tables/nova-policy.xml +++ b/doc/common/tables/nova-policy.xml @@ -55,7 +55,7 @@ = ['policy.d'] - (MultiStrOpt) Directories where policy configuration files are stored. + (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. = policy.json diff --git a/doc/common/tables/nova-spice.xml b/doc/common/tables/nova-spice.xml index 9ef657ff55..e33010f416 100644 --- a/doc/common/tables/nova-spice.xml +++ b/doc/common/tables/nova-spice.xml @@ -29,6 +29,14 @@ = http://127.0.0.1:6082/spice_auto.html (StrOpt) Location of spice HTML5 console proxy, in the form "http://127.0.0.1:6082/spice_auto.html" + + = 0.0.0.0 + (StrOpt) Host on which to listen for incoming requests + + + = 6082 + (IntOpt) Port on which to listen for incoming requests + = en-us (StrOpt) Keymap for spice diff --git a/doc/common/tables/nova-vnc.xml b/doc/common/tables/nova-vnc.xml index f3c8c184ec..4a2a47b0c1 100644 --- a/doc/common/tables/nova-vnc.xml +++ b/doc/common/tables/nova-vnc.xml @@ -17,10 +17,30 @@ [DEFAULT] + + = False + (BoolOpt) Become a daemon (background process) + + + = None + (StrOpt) SSL key file (if separate from cert) + = http://127.0.0.1:6080/vnc_auto.html (StrOpt) Location of VNC console proxy, in the form "http://127.0.0.1:6080/vnc_auto.html" + + = False + (BoolOpt) Record sessions to FILE.[session_number] + + + = False + (BoolOpt) Source is ipv6 + + + = False + (BoolOpt) Disallow non-encrypted connections + = True (BoolOpt) Enable VNC related features @@ -37,6 +57,10 @@ = 127.0.0.1 (StrOpt) The address to which proxy clients (like nova-xvpvncproxy) should connect + + = /usr/share/spice-html5 + (StrOpt) Run webserver on same port. Serve files from DIR. + [vmware] diff --git a/tools/autogenerate-config-flagmappings/nova.flagmappings b/tools/autogenerate-config-flagmappings/nova.flagmappings index 571c19d5bc..cf5cdefae2 100644 --- a/tools/autogenerate-config-flagmappings/nova.flagmappings +++ b/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