From 1d637110f1fdc7f20956666c7696c3f71376ab9b Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 2 Sep 2014 17:10:01 +0200 Subject: [PATCH] Regenerate conf tables Update tables, create some new tables and add them to the config reference. Remove ml2-cisco-apic table, it is now part of the ml_cisco table. Closes-Bug: #1364357 Change-Id: I27220e4ff5a553aa4a92b9bff1dc761af2eeacb8 --- doc/common/tables/ceilometer-collector.xml | 4 + doc/common/tables/ceilometer-common.xml | 25 +++++ doc/common/tables/ceilometer-exchange.xml | 4 + doc/common/tables/ceilometer-rpc.xml | 11 ++ doc/common/tables/ceilometer-xenapi.xml | 38 +++++++ doc/common/tables/cinder-backups_swift.xml | 4 + doc/common/tables/cinder-common.xml | 4 +- doc/common/tables/cinder-fusionio.xml | 34 ++++++ doc/common/tables/cinder-hitachi.xml | 102 +++++++++++++++++ doc/common/tables/cinder-ibmnas.xml | 26 +++++ doc/common/tables/cinder-profiler.xml | 30 +++++ doc/common/tables/cinder-storwize.xml | 8 ++ doc/common/tables/cinder-zoning_fabric.xml | 35 ++++++ doc/common/tables/cinder-zoning_manager.xml | 4 + doc/common/tables/heat-amqp.xml | 6 +- doc/common/tables/heat-common.xml | 4 - doc/common/tables/neutron-cisco.xml | 97 ++++++++++++++++ doc/common/tables/neutron-ml2.xml | 4 + doc/common/tables/neutron-ml2_cisco.xml | 105 ++++++++++++++++++ doc/common/tables/neutron-ml2_cisco_apic.xml | 70 ------------ doc/common/tables/neutron-ml2_ofa.xml | 2 +- doc/common/tables/neutron-nec.xml | 18 +-- .../tables/neutron-openvswitch_agent.xml | 32 +++--- doc/common/tables/neutron-ryu.xml | 16 +-- doc/common/tables/neutron-sdnve.xml | 36 +++--- doc/common/tables/nova-metadata.xml | 2 +- doc/common/tables/nova-serial_console.xml | 42 +++++++ doc/common/tables/sahara-common.xml | 19 +++- doc/common/tables/sahara-logging.xml | 4 + .../block-storage/section_misc.xml | 5 + .../ch_telemetryconfigure.xml | 1 + .../section_compute-options-reference.xml | 1 + .../compute/section_nova-conf.xml | 8 ++ .../section_networking-plugins-ml2.xml | 5 - .../ceilometer.flagmappings | 12 ++ .../cinder.flagmappings | 39 +++++++ .../cinder.headers | 3 + .../heat.flagmappings | 1 - .../neutron.flagmappings | 59 ++++++++-- .../neutron.headers | 1 - .../nova.flagmappings | 5 + .../nova.headers | 1 + .../sahara.flagmappings | 6 +- .../shared.headers | 1 + 44 files changed, 777 insertions(+), 157 deletions(-) create mode 100644 doc/common/tables/ceilometer-xenapi.xml create mode 100644 doc/common/tables/cinder-fusionio.xml create mode 100644 doc/common/tables/cinder-hitachi.xml create mode 100644 doc/common/tables/cinder-ibmnas.xml create mode 100644 doc/common/tables/cinder-profiler.xml delete mode 100644 doc/common/tables/neutron-ml2_cisco_apic.xml create mode 100644 doc/common/tables/nova-serial_console.xml diff --git a/doc/common/tables/ceilometer-collector.xml b/doc/common/tables/ceilometer-collector.xml index 9eca4ae35c..b3ecb2860d 100644 --- a/doc/common/tables/ceilometer-collector.xml +++ b/doc/common/tables/ceilometer-collector.xml @@ -24,6 +24,10 @@ [collector] + + requeue_sample_on_dispatcher_error = False + (BoolOpt) Requeue the sample on the collector sample queue when the collector fails to dispatch it. This is only valid if the sample come from the notifier publisher + udp_address = 0.0.0.0 (StrOpt) Address to which the UDP socket is bound. Set to an empty string to disable. diff --git a/doc/common/tables/ceilometer-common.xml b/doc/common/tables/ceilometer-common.xml index 5a066d1294..d56c45418f 100644 --- a/doc/common/tables/ceilometer-common.xml +++ b/doc/common/tables/ceilometer-common.xml @@ -41,6 +41,31 @@ notification_workers = 1 (IntOpt) Number of workers for notification service. A single notification agent is enabled by default. + + [central] + + + partitioning_group_prefix = None + (StrOpt) Work-load partitioning group prefix. Use only if you want to run multiple central agents with different config files. For each sub-group of the central agent pool with the same partitioning_group_prefix a disjoint subset of pollsters should be loaded. + + + [compute] + + + workload_partitioning = False + (BoolOpt) Enable work-load partitioning, allowing multiple compute agents to be run simultaneously. + + + [coordination] + + + backend_url = None + (StrOpt) The backend URL to use for distributed coordination. If left empty, per-deployment central agent and per-host compute agent won't do workload partitioning and will only function correctly if a single instance of that service is running. + + + heartbeat = 1.0 + (FloatOpt) Number of seconds between heartbeats for distributed coordination (float) + diff --git a/doc/common/tables/ceilometer-exchange.xml b/doc/common/tables/ceilometer-exchange.xml index c3eeb4e3bc..89760f9617 100644 --- a/doc/common/tables/ceilometer-exchange.xml +++ b/doc/common/tables/ceilometer-exchange.xml @@ -61,6 +61,10 @@ sample_source = openstack (StrOpt) Source for samples emitted on this instance. + + trove_control_exchange = trove + (StrOpt) Exchange name for DBaaS notifications + diff --git a/doc/common/tables/ceilometer-rpc.xml b/doc/common/tables/ceilometer-rpc.xml index 390525a3bd..e90f23c790 100644 --- a/doc/common/tables/ceilometer-rpc.xml +++ b/doc/common/tables/ceilometer-rpc.xml @@ -87,6 +87,17 @@ metering_secret = change this or be hacked (StrOpt) Secret value for signing metering messages. + + [publisher_notifier] + + + metering_driver = messagingv2 + (StrOpt) The driver that ceilometer uses for metering notifications. + + + metering_topic = metering + (StrOpt) The topic that ceilometer uses for metering notifications. + [publisher_rpc] diff --git a/doc/common/tables/ceilometer-xenapi.xml b/doc/common/tables/ceilometer-xenapi.xml new file mode 100644 index 0000000000..670231416a --- /dev/null +++ b/doc/common/tables/ceilometer-xenapi.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of XenAPI configuration options
Configuration option = Default valueDescription
[xenapi]
connection_password = None(StrOpt) Password for connection to XenServer/Xen Cloud Platform
connection_url = None(StrOpt) URL for connection to XenServer/Xen Cloud Platform
connection_username = root(StrOpt) Username for connection to XenServer/Xen Cloud Platform
login_timeout = 10(IntOpt) Timeout in seconds for XenAPI login.
+ diff --git a/doc/common/tables/cinder-backups_swift.xml b/doc/common/tables/cinder-backups_swift.xml index 69b3ba81b2..a4cb46ab37 100644 --- a/doc/common/tables/cinder-backups_swift.xml +++ b/doc/common/tables/cinder-backups_swift.xml @@ -49,6 +49,10 @@ backup_swift_user = None (StrOpt) Swift user name + + swift_catalog_info = object-store:swift:publicURL + (StrOpt) Info to match when looking for swift in the service catalog. Format is: separated values of the form: <service_type>:<service_name>:<endpoint_type> - Only used if backup_swift_url is unset + diff --git a/doc/common/tables/cinder-common.xml b/doc/common/tables/cinder-common.xml index c202204141..1ccb846569 100644 --- a/doc/common/tables/cinder-common.xml +++ b/doc/common/tables/cinder-common.xml @@ -87,11 +87,11 @@ policy_default_rule = default - (StrOpt) Rule checked when requested rule is not found + (StrOpt) Default rule. Enforced when a requested rule is not found. policy_file = policy.json - (StrOpt) JSON file representing policy + (StrOpt) The JSON file that defines policies. replication_api_class = cinder.replication.api.API diff --git a/doc/common/tables/cinder-fusionio.xml b/doc/common/tables/cinder-fusionio.xml new file mode 100644 index 0000000000..9f125d8bfd --- /dev/null +++ b/doc/common/tables/cinder-fusionio.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of Fusion-io driver configuration options
Configuration option = Default valueDescription
[DEFAULT]
fusionio_iocontrol_retry = 3(IntOpt) number of retries for GET operations
fusionio_iocontrol_targetdelay = 5(IntOpt) amount of time wait for iSCSI target to come online
fusionio_iocontrol_verify_cert = True(BoolOpt) verify the array certificate on each transaction
+ diff --git a/doc/common/tables/cinder-hitachi.xml b/doc/common/tables/cinder-hitachi.xml new file mode 100644 index 0000000000..2e5fe90cc1 --- /dev/null +++ b/doc/common/tables/cinder-hitachi.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of Hitachi volume driver configuration options
Configuration option = Default valueDescription
[DEFAULT]
hitachi_add_chap_user = False(BoolOpt) Add CHAP user
hitachi_async_copy_check_interval = 10(IntOpt) Interval to check copy asynchronously
hitachi_auth_method = None(StrOpt) iSCSI authentication method
hitachi_auth_password = HBSD-CHAP-password(StrOpt) iSCSI authentication password
hitachi_auth_user = HBSD-CHAP-user(StrOpt) iSCSI authentication username
hitachi_copy_speed = 3(IntOpt) Copy speed of storage system
hitachi_default_copy_method = FULL(StrOpt) Default copy method of storage system
hitachi_group_range = None(StrOpt) Range of group number
hitachi_group_request = False(BoolOpt) Request for creating HostGroup or iSCSI Target
hitachi_horcm_add_conf = True(BoolOpt) Add to HORCM configuration
hitachi_horcm_numbers = 200,201(StrOpt) Instance numbers for HORCM
hitachi_horcm_password = None(StrOpt) Password of storage system for HORCM
hitachi_horcm_user = None(StrOpt) Username of storage system for HORCM
hitachi_ldev_range = None(StrOpt) Range of logical device of storage system
hitachi_pool_id = None(IntOpt) Pool ID of storage system
hitachi_serial_number = None(StrOpt) Serial number of storage system
hitachi_target_ports = None(StrOpt) Control port names for HostGroup or iSCSI Target
hitachi_thin_pool_id = None(IntOpt) Thin pool ID of storage system
hitachi_unit_name = None(StrOpt) Name of an array unit
hitachi_zoning_request = False(BoolOpt) Request for FC Zone creating HostGroup
+ diff --git a/doc/common/tables/cinder-ibmnas.xml b/doc/common/tables/cinder-ibmnas.xml new file mode 100644 index 0000000000..32ef28dedb --- /dev/null +++ b/doc/common/tables/cinder-ibmnas.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + +
Description of IBM NAS volume driver configuration options
Configuration option = Default valueDescription
[DEFAULT]
ibmnas_platform_type = v7ku(StrOpt) IBMNAS platform type to be used as backend storage; valid values are - v7ku : for using IBM Storwize V7000 Unified, sonas : for using IBM Scale Out NAS, gpfs-nas : for using NFS based IBM GPFS deployments.
+ diff --git a/doc/common/tables/cinder-profiler.xml b/doc/common/tables/cinder-profiler.xml new file mode 100644 index 0000000000..31f94cd59f --- /dev/null +++ b/doc/common/tables/cinder-profiler.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of profiler configuration options
Configuration option = Default valueDescription
[profiler]
profiler_enabled = False(BoolOpt) If False fully disable profiling feature.
trace_sqlalchemy = False(BoolOpt) If False doesn't trace SQL requests.
+ diff --git a/doc/common/tables/cinder-storwize.xml b/doc/common/tables/cinder-storwize.xml index 54f85f750e..698272dc4f 100644 --- a/doc/common/tables/cinder-storwize.xml +++ b/doc/common/tables/cinder-storwize.xml @@ -17,6 +17,10 @@ [DEFAULT] + + storwize_svc_allow_tenant_qos = False + (BoolOpt) Allow tenants to specify QOS on create + storwize_svc_connection_protocol = iSCSI (StrOpt) Connection protocol (iSCSI/FC) @@ -41,6 +45,10 @@ storwize_svc_npiv_compatibility_mode = False (BoolOpt) Indicate whether svc driver is compatible for NPIV setup. If it is compatible, it will allow no wwpns being returned on get_conn_fc_wwpns during initialize_connection + + storwize_svc_stretched_cluster_partner = None + (StrOpt) If operating in stretched cluster mode, specify the name of the pool in which mirrored copies are stored.Example: "pool2" + storwize_svc_vol_autoexpand = True (BoolOpt) Storage system autoexpand parameter for volumes (True/False) diff --git a/doc/common/tables/cinder-zoning_fabric.xml b/doc/common/tables/cinder-zoning_fabric.xml index 08cb89e870..3b7cffdcda 100644 --- a/doc/common/tables/cinder-zoning_fabric.xml +++ b/doc/common/tables/cinder-zoning_fabric.xml @@ -49,6 +49,41 @@ zoning_policy = initiator-target (StrOpt) overridden zoning policy + + [CISCO_FABRIC_EXAMPLE] + + + cisco_fc_fabric_address = + (StrOpt) Management IP of fabric + + + cisco_fc_fabric_password = + (StrOpt) Password for user + + + cisco_fc_fabric_port = 22 + (IntOpt) Connecting port + + + cisco_fc_fabric_user = + (StrOpt) Fabric user ID + + + cisco_zone_activate = True + (BoolOpt) overridden zoning activation state + + + cisco_zone_name_prefix = None + (StrOpt) overridden zone name prefix + + + cisco_zoning_policy = initiator-target + (StrOpt) overridden zoning policy + + + cisco_zoning_vsan = None + (StrOpt) VSAN of the Fabric + diff --git a/doc/common/tables/cinder-zoning_manager.xml b/doc/common/tables/cinder-zoning_manager.xml index 381a245c35..b570546506 100644 --- a/doc/common/tables/cinder-zoning_manager.xml +++ b/doc/common/tables/cinder-zoning_manager.xml @@ -21,6 +21,10 @@ brcd_sb_connector = cinder.zonemanager.drivers.brocade.brcd_fc_zone_client_cli.BrcdFCZoneClientCLI (StrOpt) Southbound connector for zoning operation + + cisco_sb_connector = cinder.zonemanager.drivers.cisco.cisco_fc_zone_client_cli.CiscoFCZoneClientCLI + (StrOpt) Southbound connector for zoning operation + fc_san_lookup_service = cinder.zonemanager.drivers.brocade.brcd_fc_san_lookup_service.BrcdFCSanLookupService (StrOpt) FC San Lookup Service diff --git a/doc/common/tables/heat-amqp.xml b/doc/common/tables/heat-amqp.xml index 20c66099c5..42ccef6abf 100644 --- a/doc/common/tables/heat-amqp.xml +++ b/doc/common/tables/heat-amqp.xml @@ -31,11 +31,11 @@ default_notification_level = INFO - (StrOpt) Default notification level for outgoing notifications + (StrOpt) Default notification level for outgoing notifications. default_publisher_id = None - (StrOpt) Default publisher_id for outgoing notifications + (StrOpt) Default publisher_id for outgoing notifications. fake_rabbit = False @@ -43,7 +43,7 @@ list_notifier_drivers = None - (MultiStrOpt) List of drivers to send notifications (DEPRECATED) + (MultiStrOpt) List of drivers to send notifications (DEPRECATED). notification_driver = [] diff --git a/doc/common/tables/heat-common.xml b/doc/common/tables/heat-common.xml index 3ebbb0511b..4ab106f24e 100644 --- a/doc/common/tables/heat-common.xml +++ b/doc/common/tables/heat-common.xml @@ -49,10 +49,6 @@ lock_path = None (StrOpt) Directory to use for lock files. - - networking_service = None - (StrOpt) Select OpenStack component responsible for networking - nova or neutron. - periodic_interval = 60 (IntOpt) Seconds between running periodic tasks. diff --git a/doc/common/tables/neutron-cisco.xml b/doc/common/tables/neutron-cisco.xml index e2ea8b8bda..4c6aee7dfb 100644 --- a/doc/common/tables/neutron-cisco.xml +++ b/doc/common/tables/neutron-cisco.xml @@ -126,6 +126,80 @@ status_check_interval = 60 (IntOpt) Status check interval for Cisco CSR IPSec connections + + [general] + + + backlog_processing_interval = 10 + (IntOpt) Time in seconds between renewed scheduling attempts of non-scheduled routers. + + + cfg_agent_down_time = 60 + (IntOpt) Seconds of no status update until a cfg agent is considered down. + + + default_security_group = mgmt_sec_grp + (StrOpt) Default security group applied on management port. Default value is mgmt_sec_grp. + + + ensure_nova_running = True + (BoolOpt) Ensure that Nova is running before attempting to create any VM. + + + l3_admin_tenant = L3AdminTenant + (StrOpt) Name of the L3 admin tenant. + + + management_network = osn_mgmt_nw + (StrOpt) Name of management network for device configuration. Default value is osn_mgmt_nw + + + service_vm_config_path = /opt/stack/data/neutron/cisco/config_drive + (StrOpt) Path to config drive files for service VM instances. + + + templates_path = /opt/stack/data/neutron/cisco/templates + (StrOpt) Path to templates for hosting devices. + + + [hosting_devices] + + + csr1kv_booting_time = 420 + (IntOpt) Booting time in seconds before a CSR1kv becomes operational. + + + csr1kv_cfgagent_router_driver = neutron.plugins.cisco.cfg_agent.device_drivers.csr1kv.csr1kv_routing_driver.CSR1kvRoutingDriver + (StrOpt) Config agent driver for CSR1kv. + + + csr1kv_configdrive_template = csr1kv_cfg_template + (StrOpt) CSR1kv configdrive template file. + + + csr1kv_device_driver = neutron.plugins.cisco.l3.hosting_device_drivers.csr1kv_hd_driver.CSR1kvHostingDeviceDriver + (StrOpt) Hosting device driver for CSR1kv. + + + csr1kv_flavor = 621 + (StrOpt) UUID of Nova flavor for CSR1kv. + + + csr1kv_image = csr1kv_openstack_img + (StrOpt) Name of Glance image for CSR1kv. + + + csr1kv_password = cisco + (StrOpt) Password to use for CSR1kv configurations. + + + csr1kv_plugging_driver = neutron.plugins.cisco.l3.plugging_drivers.n1kv_trunking_driver.N1kvTrunkingPlugDriver + (StrOpt) Plugging driver for CSR1kv. + + + csr1kv_username = stack + (StrOpt) Username to use for CSR1kv configurations. + [ml2_cisco] @@ -137,6 +211,29 @@ vlan_name_prefix = q- (StrOpt) VLAN Name prefix + + [n1kv] + + + management_port_profile = osn_mgmt_pp + (StrOpt) Name of N1kv port profile for management ports. + + + t1_network_profile = osn_t1_np + (StrOpt) Name of N1kv network profile for T1 networks (i.e., trunk networks for VXLAN segmented traffic). + + + t1_port_profile = osn_t1_pp + (StrOpt) Name of N1kv port profile for T1 ports (i.e., ports carrying traffic from VXLAN segmented networks). + + + t2_network_profile = osn_t2_np + (StrOpt) Name of N1kv network profile for T2 networks (i.e., trunk networks for VLAN segmented traffic). + + + t2_port_profile = osn_t2_pp + (StrOpt) Name of N1kv port profile for T2 ports (i.e., ports carrying traffic from VLAN segmented networks). + diff --git a/doc/common/tables/neutron-ml2.xml b/doc/common/tables/neutron-ml2.xml index 8dcd155bbc..675656b441 100644 --- a/doc/common/tables/neutron-ml2.xml +++ b/doc/common/tables/neutron-ml2.xml @@ -17,6 +17,10 @@ [ml2] + + extension_drivers = + (ListOpt) An ordered list of extension driver entrypoints to be loaded from the neutron.ml2.extension_drivers namespace. + mechanism_drivers = (ListOpt) An ordered list of networking mechanism driver entrypoints to be loaded from the neutron.ml2.mechanism_drivers namespace. diff --git a/doc/common/tables/neutron-ml2_cisco.xml b/doc/common/tables/neutron-ml2_cisco.xml index b09ebedd4b..25ecab8718 100644 --- a/doc/common/tables/neutron-ml2_cisco.xml +++ b/doc/common/tables/neutron-ml2_cisco.xml @@ -14,6 +14,13 @@ + + [DEFAULT] + + + apic_system_id = openstack + (StrOpt) Prefix for APIC domain/names/profiles created + [ml2_cisco] @@ -21,6 +28,104 @@ managed_physical_network = None (StrOpt) The physical network managed by the switches. + + [ml2_cisco_apic] + + + apic_agent_poll_interval = 2 + (FloatOpt) Interval between agent poll for topology (in sec) + + + apic_agent_report_interval = 30 + (FloatOpt) Interval between agent status updates (in sec) + + + apic_app_profile_name = ${apic_system_id}_app + (StrOpt) Name for the app profile used for Openstack + + + apic_domain_name = ${apic_system_id} + (StrOpt) Name for the domain created on APIC + + + apic_entity_profile = ${apic_system_id}_entity_profile + (StrOpt) Name of the entity profile to be created + + + apic_function_profile = ${apic_system_id}_function_profile + (StrOpt) Name of the function profile to be created + + + apic_host_uplink_ports = + (ListOpt) The uplink ports to check for ACI connectivity + + + apic_hosts = + (ListOpt) An ordered list of host names or IP addresses of the APIC controller(s). + + + apic_lacp_profile = ${apic_system_id}_lacp_profile + (StrOpt) Name of the LACP profile to be created + + + apic_name_mapping = use_name + (StrOpt) Name mapping strategy to use: use_uuid | use_name + + + apic_node_profile = ${apic_system_id}_node_profile + (StrOpt) Name of the node profile to be created + + + apic_password = None + (StrOpt) Password for the APIC controller + + + apic_sync_interval = 0 + (IntOpt) Synchronization interval in seconds + + + apic_use_ssl = True + (BoolOpt) Use SSL to connect to the APIC controller + + + apic_username = None + (StrOpt) Username for the APIC controller + + + apic_vlan_ns_name = ${apic_system_id}_vlan_ns + (StrOpt) Name for the vlan namespace to be used for Openstack + + + apic_vlan_range = 2:4093 + (StrOpt) Range of VLAN's to be used for Openstack + + + apic_vpc_pairs = + (ListOpt) The switch pairs for VPC connectivity + + + root_helper = sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf + (StrOpt) Setup root helper as rootwrap or sudo + + + [ml2_cisco_dfa] + + + dcnm_ip = 0.0.0.0 + (StrOpt) IP address of DCNM. + + + dcnm_password = password + (StrOpt) Login password for DCNM. + + + dcnm_user = user + (StrOpt) User login name for DCNM. + + + gateway_mac = 00:00:DE:AD:BE:EF + (StrOpt) Gateway mac address when using proxy mode. + diff --git a/doc/common/tables/neutron-ml2_cisco_apic.xml b/doc/common/tables/neutron-ml2_cisco_apic.xml deleted file mode 100644 index eee8927553..0000000000 --- a/doc/common/tables/neutron-ml2_cisco_apic.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of ML2 Cisco mechanism driver configuration options
Configuration option = Default valueDescription
[ml2_cisco_apic]
apic_clear_node_profiles = False(BoolOpt) Clear the node profiles on the APIC at startup (mainly used for testing)
apic_entity_profile = openstack_entity(StrOpt) Name of the entity profile to be created
apic_function_profile = openstack_function(StrOpt) Name of the function profile to be created
apic_hosts = (ListOpt) An ordered list of host names or IP addresses of the APIC controller(s).
apic_node_profile = openstack_profile(StrOpt) Name of the node profile to be created
apic_password = None(StrOpt) Password for the APIC controller
apic_use_ssl = True(BoolOpt) Use SSL to connect to the APIC controller
apic_username = None(StrOpt) Username for the APIC controller
apic_vlan_ns_name = openstack_ns(StrOpt) Name for the vlan namespace to be used for openstack
apic_vlan_range = 2:4093(StrOpt) Range of VLAN's to be used for Openstack
apic_vmm_domain = openstack(StrOpt) Name for the VMM domain to be created for Openstack
apic_vmm_provider = VMware(StrOpt) Name for the VMM domain provider
- diff --git a/doc/common/tables/neutron-ml2_ofa.xml b/doc/common/tables/neutron-ml2_ofa.xml index cded7d2109..bc4b99fbea 100644 --- a/doc/common/tables/neutron-ml2_ofa.xml +++ b/doc/common/tables/neutron-ml2_ofa.xml @@ -34,7 +34,7 @@ dont_fragment = True - (BoolOpt) Set or un-set the don't fragment (DF) bit on outgoing IP packet carrying GRE/VXLAN tunnel + (BoolOpt) Set or un-set the don't fragment (DF) bit on outgoing IP packet carrying GRE/VXLAN tunnel. get_datapath_retry_times = 60 diff --git a/doc/common/tables/neutron-nec.xml b/doc/common/tables/neutron-nec.xml index 2eb041302f..5945da3689 100644 --- a/doc/common/tables/neutron-nec.xml +++ b/doc/common/tables/neutron-nec.xml @@ -19,31 +19,31 @@ api_max_attempts = 3 - (IntOpt) Maximum attempts per OFC API request.NEC plugin retries API request to OFC when OFC returns ServiceUnavailable (503).The value must be greater than 0. + (IntOpt) Maximum attempts per OFC API request. NEC plugin retries API request to OFC when OFC returns ServiceUnavailable (503). The value must be greater than 0. cert_file = None - (StrOpt) Certificate file + (StrOpt) Location of certificate file. driver = trema - (StrOpt) Driver to use + (StrOpt) Driver to use. enable_packet_filter = True - (BoolOpt) Enable packet filter + (BoolOpt) Enable packet filter. host = 127.0.0.1 - (StrOpt) Host to connect to + (StrOpt) Host to connect to. insecure_ssl = False - (BoolOpt) Disable SSL certificate verification + (BoolOpt) Disable SSL certificate verification. key_file = None - (StrOpt) Key file + (StrOpt) Location of key file. path_prefix = @@ -51,11 +51,11 @@ port = 8888 - (StrOpt) Port to connect to + (StrOpt) Port to connect to. use_ssl = False - (BoolOpt) Use SSL to connect + (BoolOpt) Use SSL to connect. [PROVIDER] diff --git a/doc/common/tables/neutron-openvswitch_agent.xml b/doc/common/tables/neutron-openvswitch_agent.xml index 00e08be035..79ea4648bd 100644 --- a/doc/common/tables/neutron-openvswitch_agent.xml +++ b/doc/common/tables/neutron-openvswitch_agent.xml @@ -34,19 +34,19 @@ arp_responder = False - (BoolOpt) Enable local ARP responder if it is supported. Requires OVS 2.1 and ML2 l2population driver. Allows the switch (when supporting an overlay) to respond to an ARP request locally without performing a costly ARP broadcast into the overlay + (BoolOpt) Enable local ARP responder if it is supported. Requires OVS 2.1 and ML2 l2population driver. Allows the switch (when supporting an overlay) to respond to an ARP request locally without performing a costly ARP broadcast into the overlay. dont_fragment = True - (BoolOpt) Set or un-set the don't fragment (DF) bit on outgoing IP packet carrying GRE/VXLAN tunnel + (BoolOpt) Set or un-set the don't fragment (DF) bit on outgoing IP packet carrying GRE/VXLAN tunnel. enable_distributed_routing = False - (BoolOpt) Make the l2 agent run in DVR mode + (BoolOpt) Make the l2 agent run in DVR mode. l2_population = False - (BoolOpt) Use ML2 l2population mechanism driver to learn remote mac and IPs and improve tunnel scalability + (BoolOpt) Use ML2 l2population mechanism driver to learn remote MAC and IPs and improve tunnel scalability. minimize_polling = True @@ -54,11 +54,11 @@ ovsdb_monitor_respawn_interval = 30 - (IntOpt) The number of seconds to wait before respawning the ovsdb monitor after losing communication with it + (IntOpt) The number of seconds to wait before respawning the ovsdb monitor after losing communication with it. tunnel_types = - (ListOpt) Network types supported by the agent (gre and/or vxlan) + (ListOpt) Network types supported by the agent (gre and/or vxlan). veth_mtu = None @@ -84,15 +84,15 @@ enable_tunneling = False - (BoolOpt) Enable tunneling support + (BoolOpt) Enable tunneling support. int_peer_patch_port = patch-tun - (StrOpt) Peer patch port in integration bridge for tunnel bridge + (StrOpt) Peer patch port in integration bridge for tunnel bridge. integration_bridge = br-int - (StrOpt) Integration bridge to use + (StrOpt) Integration bridge to use. local_ip = @@ -100,31 +100,31 @@ network_vlan_ranges = - (ListOpt) List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> + (ListOpt) List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>. tenant_network_type = local - (StrOpt) Network type for tenant networks (local, vlan, gre, vxlan, or none) + (StrOpt) Network type for tenant networks (local, vlan, gre, vxlan, or none). tun_peer_patch_port = patch-int - (StrOpt) Peer patch port in tunnel bridge for integration bridge + (StrOpt) Peer patch port in tunnel bridge for integration bridge. tunnel_bridge = br-tun - (StrOpt) Tunnel bridge to use + (StrOpt) Tunnel bridge to use. tunnel_id_ranges = - (ListOpt) List of <tun_min>:<tun_max> + (ListOpt) List of <tun_min>:<tun_max>. tunnel_type = - (StrOpt) The type of tunnels to use when utilizing tunnels, either 'gre' or 'vxlan' + (StrOpt) The type of tunnels to use when utilizing tunnels, either 'gre' or 'vxlan'. use_veth_interconnection = False - (BoolOpt) Use veths instead of patch ports to interconnect the integration bridge to physical bridges + (BoolOpt) Use veths instead of patch ports to interconnect the integration bridge to physical bridges. diff --git a/doc/common/tables/neutron-ryu.xml b/doc/common/tables/neutron-ryu.xml index 66c4144cbf..4906da0500 100644 --- a/doc/common/tables/neutron-ryu.xml +++ b/doc/common/tables/neutron-ryu.xml @@ -30,35 +30,35 @@ openflow_rest_api = 127.0.0.1:8080 - (StrOpt) OpenFlow REST API location + (StrOpt) OpenFlow REST API location. ovsdb_interface = None - (StrOpt) OVSDB interface to connect to + (StrOpt) OVSDB interface to connect to. ovsdb_ip = None - (StrOpt) OVSDB IP to connect to + (StrOpt) OVSDB IP to connect to. ovsdb_port = 6634 - (IntOpt) OVSDB port to connect to + (IntOpt) OVSDB port to connect to. tunnel_interface = None - (StrOpt) Tunnel interface to use + (StrOpt) Tunnel interface to use. tunnel_ip = None - (StrOpt) Tunnel IP to use + (StrOpt) Tunnel IP to use. tunnel_key_max = 16777215 - (IntOpt) Maximum tunnel ID to use + (IntOpt) Maximum tunnel ID to use. tunnel_key_min = 1 - (IntOpt) Minimum tunnel ID to use + (IntOpt) Minimum tunnel ID to use. diff --git a/doc/common/tables/neutron-sdnve.xml b/doc/common/tables/neutron-sdnve.xml index cb872b8923..8fd798f230 100644 --- a/doc/common/tables/neutron-sdnve.xml +++ b/doc/common/tables/neutron-sdnve.xml @@ -19,78 +19,78 @@ base_url = /one/nb/v2/ - (StrOpt) Base URL for SDN-VE controller REST API + (StrOpt) Base URL for SDN-VE controller REST API. controller_ips = 127.0.0.1 - (ListOpt) List of IP addresses of SDN-VE controller(s) + (ListOpt) List of IP addresses of SDN-VE controller(s). default_tenant_type = OVERLAY - (StrOpt) Tenant type: OVERLAY (default) or OF + (StrOpt) Tenant type: OVERLAY (default) or OF. format = json - (StrOpt) SDN-VE request/response format + (StrOpt) SDN-VE request/response format. info = sdnve_info_string - (StrOpt) SDN-VE RPC subject + (StrOpt) SDN-VE RPC subject. integration_bridge = None - (StrOpt) Integration bridge to use + (StrOpt) Integration bridge to use. interface_mappings = - (ListOpt) List of <physical_network_name>:<interface_name> + (ListOpt) List of <physical_network_name>:<interface_name> mappings. of_signature = SDNVE-OF - (StrOpt) The string in tenant description that indicates the tenant is a OF tenant + (StrOpt) The string in tenant description that indicates the tenant is a OF tenant. out_of_band = True - (BoolOpt) Indicating if controller is out of band or not + (BoolOpt) Indicating if controller is out of band or not. overlay_signature = SDNVE-OVERLAY - (StrOpt) The string in tenant description that indicates the tenant is a OVERLAY tenant + (StrOpt) The string in tenant description that indicates the tenant is a OVERLAY tenant. password = admin - (StrOpt) SDN-VE administrator password + (StrOpt) SDN-VE administrator password. port = 8443 - (StrOpt) SDN-VE controller port number + (StrOpt) SDN-VE controller port number. reset_bridge = True - (BoolOpt) Reset the integration bridge before use + (BoolOpt) Whether to reset the integration bridge before use. use_fake_controller = False - (BoolOpt) If set to True uses a fake controller. + (BoolOpt) Whether to use a fake controller. userid = admin - (StrOpt) SDN-VE administrator user id + (StrOpt) SDN-VE administrator user ID. [SDNVE_AGENT] polling_interval = 2 - (IntOpt) Agent polling interval if necessary + (IntOpt) Agent polling interval if necessary. root_helper = sudo - (StrOpt) Using root helper + (StrOpt) Using root helper. rpc = True - (BoolOpt) Whether using rpc + (BoolOpt) Whether to use rpc. diff --git a/doc/common/tables/nova-metadata.xml b/doc/common/tables/nova-metadata.xml index 70e41e9e0b..7601928b3b 100644 --- a/doc/common/tables/nova-metadata.xml +++ b/doc/common/tables/nova-metadata.xml @@ -47,7 +47,7 @@ vendordata_jsonfile_path = None - (StrOpt) File to load json formatted vendor data from + (StrOpt) File to load JSON formatted vendor data from diff --git a/doc/common/tables/nova-serial_console.xml b/doc/common/tables/nova-serial_console.xml new file mode 100644 index 0000000000..953e2a4080 --- /dev/null +++ b/doc/common/tables/nova-serial_console.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of serial console configuration options
Configuration option = Default valueDescription
[serial_console]
base_url = http://127.0.0.1:6083/(StrOpt) Location of serial console proxy.
enabled = False(BoolOpt) Enable serial console related features
listen = 127.0.0.1(StrOpt) IP address on which instance serial console should listen
port_range = 10000:20000(StrOpt) Range of TCP ports to use for serial ports on compute hosts
proxyclient_address = 127.0.0.1(StrOpt) The address to which proxy clients (like nova-serialproxy) should connect
+ diff --git a/doc/common/tables/sahara-common.xml b/doc/common/tables/sahara-common.xml index 4787ffe5b3..39875dc668 100644 --- a/doc/common/tables/sahara-common.xml +++ b/doc/common/tables/sahara-common.xml @@ -17,6 +17,19 @@ [DEFAULT] + + cluster_remote_threshold = 70 + (IntOpt) The same as global_remote_threshold, but for a single cluster. + + + compute_topology_file = etc/sahara/compute.topology + (StrOpt) File with nova compute topology. + It should contain mapping between nova computes and racks. + File format: + compute1 /rack1 + compute2 /rack2 + compute3 /rack2 + control_exchange = openstack (StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option. @@ -52,7 +65,7 @@ job_binary_max_KB = 5120 - (IntOpt) Maximum length of job binary data in kilobytes that may be stored or retrieved in a single operation + (IntOpt) Maximum length of job binary data in kilobytes that may be stored or retrieved in a single operation. job_workflow_postfix = @@ -68,7 +81,7 @@ min_transient_cluster_active_time = 30 - (IntOpt) Minimal "lifetime" in seconds for a transient cluster. Cluster is guarantied to be "alive" within this time period. + (IntOpt) Minimal "lifetime" in seconds for a transient cluster. Cluster is guaranteed to be "alive" within this time period. node_domain = novalocal @@ -88,7 +101,7 @@ periodic_interval_max = 60 - (IntOpt) Max interval size between periodic tasks execution in seconds + (IntOpt) Max interval size between periodic tasks execution in seconds. plugins = vanilla, hdp diff --git a/doc/common/tables/sahara-logging.xml b/doc/common/tables/sahara-logging.xml index df44701500..ae50b76d86 100644 --- a/doc/common/tables/sahara-logging.xml +++ b/doc/common/tables/sahara-logging.xml @@ -21,6 +21,10 @@ default_log_levels = amqplib=WARN, qpid.messaging=INFO, stevedore=INFO, eventlet.wsgi.server=WARN, sqlalchemy=WARN, boto=WARN, suds=INFO, keystone=INFO, paramiko=WARN, requests=WARN, iso8601=WARN (ListOpt) List of logger=LEVEL pairs. + + fatal_deprecations = False + (BoolOpt) Enables or disables fatal status of deprecations. + instance_format = "[instance: %(uuid)s] " (StrOpt) The format for an instance that is passed with the log message. diff --git a/doc/config-reference/block-storage/section_misc.xml b/doc/config-reference/block-storage/section_misc.xml index 7ad48b7516..23a5a27759 100644 --- a/doc/config-reference/block-storage/section_misc.xml +++ b/doc/config-reference/block-storage/section_misc.xml @@ -42,4 +42,9 @@ + + + + + diff --git a/doc/config-reference/ch_telemetryconfigure.xml b/doc/config-reference/ch_telemetryconfigure.xml index a20b9f8ae1..5c5aa4456c 100644 --- a/doc/config-reference/ch_telemetryconfigure.xml +++ b/doc/config-reference/ch_telemetryconfigure.xml @@ -35,6 +35,7 @@ + diff --git a/doc/config-reference/compute/section_compute-options-reference.xml b/doc/config-reference/compute/section_compute-options-reference.xml index fbe92f0af9..960faf8a10 100644 --- a/doc/config-reference/compute/section_compute-options-reference.xml +++ b/doc/config-reference/compute/section_compute-options-reference.xml @@ -46,6 +46,7 @@ + diff --git a/doc/config-reference/compute/section_nova-conf.xml b/doc/config-reference/compute/section_nova-conf.xml index 898ab08a86..7632b6b328 100644 --- a/doc/config-reference/compute/section_nova-conf.xml +++ b/doc/config-reference/compute/section_nova-conf.xml @@ -170,6 +170,14 @@ + + [serial_console] + + + Configures serial console. + + + [spice] diff --git a/doc/config-reference/networking/section_networking-plugins-ml2.xml b/doc/config-reference/networking/section_networking-plugins-ml2.xml index 9f898840d4..fae17f6eed 100644 --- a/doc/config-reference/networking/section_networking-plugins-ml2.xml +++ b/doc/config-reference/networking/section_networking-plugins-ml2.xml @@ -83,11 +83,6 @@ options -
- Modular Layer 2 (ml2) Cisco APIC Mechanism configuration - options - -
Modular Layer 2 (ml2) Freescale SDN Mechanism configuration options diff --git a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings index 4094b42f12..8f609e0e29 100644 --- a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings +++ b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings @@ -93,6 +93,7 @@ sahara_control_exchange exchange sample_source exchange syslog_log_facility logging transport_url rpc +trove_control_exchange exchange use_stderr logging use_syslog logging use_syslog_rfc_format logging @@ -120,8 +121,13 @@ cells/mute_child_interval nova_cells cells/name nova_cells cells/reserve_percent nova_cells cells/topic nova_cells +central/partitioning_group_prefix common +collector/requeue_sample_on_dispatcher_error collector collector/udp_address collector collector/udp_port collector +compute/workload_partitioning common +coordination/backend_url common +coordination/heartbeat common database/alarm_connection database database/backend database database/connection database @@ -190,6 +196,8 @@ notification/ack_on_event_error events notification/messaging_urls rpc notification/store_events events publisher/metering_secret rpc +publisher_notifier/metering_driver rpc +publisher_notifier/metering_topic rpc publisher_rpc/metering_topic rpc service_credentials/insecure auth service_credentials/os_auth_url auth @@ -206,3 +214,7 @@ vmware/host_password vmware vmware/host_username vmware vmware/task_poll_interval vmware vmware/wsdl_location vmware +xenapi/connection_password xenapi +xenapi/connection_url xenapi +xenapi/connection_username xenapi +xenapi/login_timeout xenapi diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings index 68320c4677..bf77b4f13b 100644 --- a/tools/autogenerate-config-flagmappings/cinder.flagmappings +++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings @@ -73,6 +73,9 @@ extra_capabilities api fake_rabbit rpc fatal_deprecations logging fatal_exception_format_errors logging +fusionio_iocontrol_retry fusionio +fusionio_iocontrol_targetdelay fusionio +fusionio_iocontrol_verify_cert fusionio glance_api_insecure images glance_api_servers images glance_api_ssl_compression images @@ -95,6 +98,27 @@ gpfs_storage_pool storage_gpfs hds_cinder_config_file hds-hus hds_hnas_iscsi_config_file hds-hnas hds_hnas_nfs_config_file hds-hnas +hitachi_add_chap_user hitachi +hitachi_async_copy_check_interval hitachi +hitachi_auth_method hitachi +hitachi_auth_password hitachi +hitachi_auth_user hitachi +hitachi_copy_check_interval +hitachi_copy_speed hitachi +hitachi_default_copy_method hitachi +hitachi_group_range hitachi +hitachi_group_request hitachi +hitachi_horcm_add_conf hitachi +hitachi_horcm_numbers hitachi +hitachi_horcm_password hitachi +hitachi_horcm_user hitachi +hitachi_ldev_range hitachi +hitachi_pool_id hitachi +hitachi_serial_number hitachi +hitachi_target_ports hitachi +hitachi_thin_pool_id hitachi +hitachi_unit_name hitachi +hitachi_zoning_request hitachi host common hp3par_api_url hp3par hp3par_cpg hp3par @@ -112,6 +136,7 @@ hplefthand_debug hplefthand hplefthand_iscsi_chap_enabled hplefthand hplefthand_password hplefthand hplefthand_username hplefthand +ibmnas_platform_type ibmnas iet_conf common image_conversion_dir images initiator_auto_registration emc @@ -329,12 +354,14 @@ storage_availability_zone common storage_vnx_authentication_type emc storage_vnx_pool_name emc storage_vnx_security_file_dir emc +storwize_svc_allow_tenant_qos storwize storwize_svc_connection_protocol storwize storwize_svc_flashcopy_timeout storwize storwize_svc_iscsi_chap_enabled storwize storwize_svc_multihostmap_enabled storwize storwize_svc_multipath_enabled storwize storwize_svc_npiv_compatibility_mode storwize +storwize_svc_stretched_cluster_partner storwize storwize_svc_vol_autoexpand storwize storwize_svc_vol_compression storwize storwize_svc_vol_easytier storwize @@ -343,6 +370,7 @@ storwize_svc_vol_iogrp storwize storwize_svc_vol_rsize storwize storwize_svc_vol_warning storwize storwize_svc_volpool_name storwize +swift_catalog_info backups_swift syslog_log_facility logging tcp_keepalive common tcp_keepalive_count common @@ -435,6 +463,14 @@ BRCD_FABRIC_EXAMPLE/principal_switch_wwn zoning_fabric BRCD_FABRIC_EXAMPLE/zone_activate zoning_fabric BRCD_FABRIC_EXAMPLE/zone_name_prefix zoning_fabric BRCD_FABRIC_EXAMPLE/zoning_policy zoning_fabric +CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_address zoning_fabric +CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_password zoning_fabric +CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_port zoning_fabric +CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_user zoning_fabric +CISCO_FABRIC_EXAMPLE/cisco_zone_activate zoning_fabric +CISCO_FABRIC_EXAMPLE/cisco_zone_name_prefix zoning_fabric +CISCO_FABRIC_EXAMPLE/cisco_zoning_policy zoning_fabric +CISCO_FABRIC_EXAMPLE/cisco_zoning_vsan zoning_fabric database/backend database database/connection database database/connection_debug database @@ -457,6 +493,7 @@ database/sqlite_synchronous database database/use_db_reconnect database database/use_tpool database fc-zone-manager/brcd_sb_connector zoning_manager +fc-zone-manager/cisco_sb_connector zoning_manager fc-zone-manager/fc_fabric_names zoning fc-zone-manager/fc_san_lookup_service zoning_manager fc-zone-manager/zone_driver zoning_manager @@ -498,6 +535,8 @@ matchmaker_redis/host rpc matchmaker_redis/password rpc matchmaker_redis/port rpc matchmaker_ring/ringfile rpc +profiler/profiler_enabled profiler +profiler/trace_sqlalchemy profiler ssl/ca_file ca ssl/cert_file ca ssl/key_file ca diff --git a/tools/autogenerate-config-flagmappings/cinder.headers b/tools/autogenerate-config-flagmappings/cinder.headers index 79b7ffbe13..35b8ca4360 100644 --- a/tools/autogenerate-config-flagmappings/cinder.headers +++ b/tools/autogenerate-config-flagmappings/cinder.headers @@ -6,12 +6,15 @@ block-device block device coraid Coraid AoE driver emc EMC eqlx Dell EqualLogic volume driver +fusionio Fusion-io driver hds-hnas HDS HNAS iSCSI and NFS driver hds-hus HDS HUS iSCSI driver +hitachi Hitachi volume driver hp3par HP 3PAR Fibre Channel and iSCSI drivers hplefthand HP LeftHand/StoreVirtual driver hpmsa HP MSA Fiber Channel driver huawei Huawei storage driver +ibmnas IBM NAS volume driver images images keymgr key manager lvm LVM diff --git a/tools/autogenerate-config-flagmappings/heat.flagmappings b/tools/autogenerate-config-flagmappings/heat.flagmappings index 24dc210b6f..bd5639df60 100644 --- a/tools/autogenerate-config-flagmappings/heat.flagmappings +++ b/tools/autogenerate-config-flagmappings/heat.flagmappings @@ -54,7 +54,6 @@ max_resources_per_stack quota max_stacks_per_tenant quota max_template_size quota memcached_servers auth_token -networking_service common notification_driver amqp notification_topics amqp num_engine_workers api diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings index c2e2d11389..2d123b3266 100644 --- a/tools/autogenerate-config-flagmappings/neutron.flagmappings +++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings @@ -13,6 +13,7 @@ amqp_durable_queues rpc api_extensions_path api api_paste_config api api_workers common +apic_system_id ml2_cisco auth_ca_cert common auth_insecure common auth_region common @@ -460,6 +461,14 @@ database/sqlite_synchronous database database/use_db_reconnect database fwaas/driver nec fwaas/enabled fwaas +general/backlog_processing_interval cisco +general/cfg_agent_down_time cisco +general/default_security_group cisco +general/ensure_nova_running cisco +general/l3_admin_tenant cisco +general/management_network cisco +general/service_vm_config_path cisco +general/templates_path cisco haproxy/loadbalancer_state_path lbaas_haproxy haproxy/send_gratuitous_arp lbaas_haproxy haproxy/user_group lbaas_haproxy @@ -485,6 +494,15 @@ heleoslb/mgmt_id embrane_lb heleoslb/oob_id embrane_lb heleoslb/resource_pool_id embrane_lb heleoslb/sync_interval embrane_lb +hosting_devices/csr1kv_booting_time cisco +hosting_devices/csr1kv_cfgagent_router_driver cisco +hosting_devices/csr1kv_configdrive_template cisco +hosting_devices/csr1kv_device_driver cisco +hosting_devices/csr1kv_flavor cisco +hosting_devices/csr1kv_image cisco +hosting_devices/csr1kv_password cisco +hosting_devices/csr1kv_plugging_driver cisco +hosting_devices/csr1kv_username cisco hyperv/force_hyperv_utils_v1 hyperv_agent ipsec/config_base_dir vpn ipsec/ipsec_status_check_interval vpn @@ -529,6 +547,7 @@ matchmaker_redis/host redis matchmaker_redis/password redis matchmaker_redis/port redis matchmaker_ring/ringfile rpc +ml2/extension_drivers ml2 ml2/mechanism_drivers ml2 ml2/tenant_network_types ml2 ml2/type_drivers ml2 @@ -547,18 +566,29 @@ ml2_brocade/username ml2_brocade ml2_cisco/managed_physical_network ml2_cisco ml2_cisco/svi_round_robin cisco ml2_cisco/vlan_name_prefix cisco -ml2_cisco_apic/apic_clear_node_profiles ml2_cisco_apic -ml2_cisco_apic/apic_entity_profile ml2_cisco_apic -ml2_cisco_apic/apic_function_profile ml2_cisco_apic -ml2_cisco_apic/apic_hosts ml2_cisco_apic -ml2_cisco_apic/apic_node_profile ml2_cisco_apic -ml2_cisco_apic/apic_password ml2_cisco_apic -ml2_cisco_apic/apic_use_ssl ml2_cisco_apic -ml2_cisco_apic/apic_username ml2_cisco_apic -ml2_cisco_apic/apic_vlan_ns_name ml2_cisco_apic -ml2_cisco_apic/apic_vlan_range ml2_cisco_apic -ml2_cisco_apic/apic_vmm_domain ml2_cisco_apic -ml2_cisco_apic/apic_vmm_provider ml2_cisco_apic +ml2_cisco_apic/apic_agent_poll_interval ml2_cisco +ml2_cisco_apic/apic_agent_report_interval ml2_cisco +ml2_cisco_apic/apic_app_profile_name ml2_cisco +ml2_cisco_apic/apic_domain_name ml2_cisco +ml2_cisco_apic/apic_entity_profile ml2_cisco +ml2_cisco_apic/apic_function_profile ml2_cisco +ml2_cisco_apic/apic_host_uplink_ports ml2_cisco +ml2_cisco_apic/apic_hosts ml2_cisco +ml2_cisco_apic/apic_lacp_profile ml2_cisco +ml2_cisco_apic/apic_name_mapping ml2_cisco +ml2_cisco_apic/apic_node_profile ml2_cisco +ml2_cisco_apic/apic_password ml2_cisco +ml2_cisco_apic/apic_sync_interval ml2_cisco +ml2_cisco_apic/apic_use_ssl ml2_cisco +ml2_cisco_apic/apic_username ml2_cisco +ml2_cisco_apic/apic_vlan_ns_name ml2_cisco +ml2_cisco_apic/apic_vlan_range ml2_cisco +ml2_cisco_apic/apic_vpc_pairs ml2_cisco +ml2_cisco_apic/root_helper ml2_cisco +ml2_cisco_dfa/dcnm_ip ml2_cisco +ml2_cisco_dfa/dcnm_password ml2_cisco +ml2_cisco_dfa/dcnm_user ml2_cisco +ml2_cisco_dfa/gateway_mac ml2_cisco ml2_fslsdn/crd_api_insecure ml2_fslsdn ml2_fslsdn/crd_auth_strategy ml2_fslsdn ml2_fslsdn/crd_auth_url ml2_fslsdn @@ -585,6 +615,11 @@ ml2_type_gre/tunnel_id_ranges ml2_gre ml2_type_vlan/network_vlan_ranges ml2_vlan ml2_type_vxlan/vni_ranges ml2_vxlan ml2_type_vxlan/vxlan_group ml2_vxlan +n1kv/management_port_profile cisco +n1kv/t1_network_profile cisco +n1kv/t1_port_profile cisco +n1kv/t2_network_profile cisco +n1kv/t2_port_profile cisco netscaler_driver/netscaler_ncc_password lbaas_netscaler netscaler_driver/netscaler_ncc_uri lbaas_netscaler netscaler_driver/netscaler_ncc_username lbaas_netscaler diff --git a/tools/autogenerate-config-flagmappings/neutron.headers b/tools/autogenerate-config-flagmappings/neutron.headers index 73d6fe447c..b7f238e182 100644 --- a/tools/autogenerate-config-flagmappings/neutron.headers +++ b/tools/autogenerate-config-flagmappings/neutron.headers @@ -25,7 +25,6 @@ ml2_arista ML2 Arista mechanism driver ml2_bigswitch ML2 BigSwitch mechanism driver ml2_brocade ML2 Brocade mechanism driver ml2_cisco ML2 Cisco mechanism driver -ml2_cisco_apic ML2 Cisco mechanism driver ml2_flat ML2 Flat mechanism driver ml2_fslsdn ML2 Freescale SDN mechanism driver ml2_gre ML2 GRE diff --git a/tools/autogenerate-config-flagmappings/nova.flagmappings b/tools/autogenerate-config-flagmappings/nova.flagmappings index da92d96116..07178fd699 100644 --- a/tools/autogenerate-config-flagmappings/nova.flagmappings +++ b/tools/autogenerate-config-flagmappings/nova.flagmappings @@ -613,6 +613,11 @@ osapi_v3/extensions_blacklist apiv3 osapi_v3/extensions_whitelist apiv3 rdp/enabled rdp rdp/html5_proxy_base_url rdp +serial_console/base_url serial_console +serial_console/enabled serial_console +serial_console/listen serial_console +serial_console/port_range serial_console +serial_console/proxyclient_address serial_console spice/agent_enabled spice spice/enabled spice spice/html5proxy_base_url spice diff --git a/tools/autogenerate-config-flagmappings/nova.headers b/tools/autogenerate-config-flagmappings/nova.headers index f79808dd2f..9e75ef7ded 100644 --- a/tools/autogenerate-config-flagmappings/nova.headers +++ b/tools/autogenerate-config-flagmappings/nova.headers @@ -24,6 +24,7 @@ periodic periodic rdp RDP rpc_all all RPC s3 S3 +serial_console serial console spice SPICE tilera Tilera trustedcomputing trusted computing diff --git a/tools/autogenerate-config-flagmappings/sahara.flagmappings b/tools/autogenerate-config-flagmappings/sahara.flagmappings index 7a5290c10b..ed8e7f6e5e 100644 --- a/tools/autogenerate-config-flagmappings/sahara.flagmappings +++ b/tools/autogenerate-config-flagmappings/sahara.flagmappings @@ -1,7 +1,7 @@ amqp_auto_delete amqp amqp_durable_queues amqp -cluster_remote_threshold -compute_topology_file +cluster_remote_threshold common +compute_topology_file common control_exchange common db_driver database debug debug @@ -11,7 +11,7 @@ disable_process_locking debug enable_data_locality common enable_hypervisor_awareness common fake_rabbit debug -fatal_deprecations +fatal_deprecations logging global_remote_threshold common host common infrastructure_engine common diff --git a/tools/autogenerate-config-flagmappings/shared.headers b/tools/autogenerate-config-flagmappings/shared.headers index 46c70bc341..883ae95689 100644 --- a/tools/autogenerate-config-flagmappings/shared.headers +++ b/tools/autogenerate-config-flagmappings/shared.headers @@ -28,3 +28,4 @@ vmware VMware vpn VPN wsgi WSGI zeromq ZeroMQ +xenapi XenAPI