From b09fcee79d607f9c44e63c64dcf08e3b283a7e67 Mon Sep 17 00:00:00 2001 From: Gauvain Pocentek Date: Thu, 7 May 2015 07:35:46 +0200 Subject: [PATCH] Remove config-ref tables that shouldn't be there autohelp.py doesn't remove old configuration tables, and the cleanup hasn't been done recently. This patch removes tables that should have disappeared. Change-Id: I3e8b7433871116b74970ca7ad0affd345557641d Closes-Bug: #1448122 --- doc/common/tables/ceilometer-rootwrap.xml | 42 ------------ doc/common/tables/ceilometer-testing.xml | 26 -------- doc/common/tables/cinder-drbd.xml | 26 -------- .../tables/cinder-fujitsu_eternus_dx.xml | 26 -------- doc/common/tables/cinder-fusionio.xml | 34 ---------- doc/common/tables/cinder-hpmsa.xml | 26 -------- doc/common/tables/cinder-rootwrap.xml | 42 ------------ doc/common/tables/cinder-san-solaris.xml | 26 -------- doc/common/tables/cinder-testing.xml | 26 -------- doc/common/tables/ironic-rootwrap.xml | 42 ------------ doc/common/tables/keystone-testing.xml | 26 -------- doc/common/tables/neutron-cfg_agent.xml | 38 ----------- .../tables/neutron-l3_brocade_mlx_switch.xml | 42 ------------ .../neutron-ml2_brocade_fi_ni_switch.xml | 50 -------------- doc/common/tables/neutron-mlnx.xml | 38 ----------- doc/common/tables/neutron-nuage.xml | 65 ------------------- doc/common/tables/neutron-rootwrap.xml | 57 ---------------- doc/common/tables/neutron-ryu.xml | 30 --------- doc/common/tables/neutron-testing.xml | 26 -------- doc/common/tables/nova-rootwrap.xml | 42 ------------ doc/common/tables/sahara-rootwrap.xml | 57 ---------------- doc/common/tables/sahara-testing.xml | 26 -------- doc/common/tables/trove-testing.xml | 26 -------- .../block-storage/section_misc.xml | 10 --- .../ch_baremetalconfigure.xml | 1 - .../ch_databaseserviceconfigure.xml | 1 - .../ch_dataprocessingserviceconfigure.xml | 2 - doc/config-reference/ch_identityconfigure.xml | 1 - .../ch_telemetryconfigure.xml | 2 - .../section_compute-options-reference.xml | 1 - .../section_networking-options-reference.xml | 13 ---- .../section_networking-plugins-ml2.xml | 9 --- .../networking/section_networking-plugins.xml | 20 ------ 33 files changed, 899 deletions(-) delete mode 100644 doc/common/tables/ceilometer-rootwrap.xml delete mode 100644 doc/common/tables/ceilometer-testing.xml delete mode 100644 doc/common/tables/cinder-drbd.xml delete mode 100644 doc/common/tables/cinder-fujitsu_eternus_dx.xml delete mode 100644 doc/common/tables/cinder-fusionio.xml delete mode 100644 doc/common/tables/cinder-hpmsa.xml delete mode 100644 doc/common/tables/cinder-rootwrap.xml delete mode 100644 doc/common/tables/cinder-san-solaris.xml delete mode 100644 doc/common/tables/cinder-testing.xml delete mode 100644 doc/common/tables/ironic-rootwrap.xml delete mode 100644 doc/common/tables/keystone-testing.xml delete mode 100644 doc/common/tables/neutron-cfg_agent.xml delete mode 100644 doc/common/tables/neutron-l3_brocade_mlx_switch.xml delete mode 100644 doc/common/tables/neutron-ml2_brocade_fi_ni_switch.xml delete mode 100644 doc/common/tables/neutron-mlnx.xml delete mode 100644 doc/common/tables/neutron-nuage.xml delete mode 100644 doc/common/tables/neutron-rootwrap.xml delete mode 100644 doc/common/tables/neutron-ryu.xml delete mode 100644 doc/common/tables/neutron-testing.xml delete mode 100644 doc/common/tables/nova-rootwrap.xml delete mode 100644 doc/common/tables/sahara-rootwrap.xml delete mode 100644 doc/common/tables/sahara-testing.xml delete mode 100644 doc/common/tables/trove-testing.xml diff --git a/doc/common/tables/ceilometer-rootwrap.xml b/doc/common/tables/ceilometer-rootwrap.xml deleted file mode 100644 index f6956ea30f..0000000000 --- a/doc/common/tables/ceilometer-rootwrap.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of rootwrap configuration options
Configuration option = Default valueDescription
[DEFAULT]
= /etc/ceilometer/rootwrap.d,/usr/share/ceilometer/rootwrapList of directories to load filter definitions from (separated by ','). These directories MUST all be only writeable by root !
= /sbin,/usr/sbin,/bin,/usr/binList of directories to search executables in, in case filters do not explicitely specify a full path (separated by ',') If not specified, defaults to system PATH environment variable. These directories MUST all be only writeable by root !
= FalseEnable logging to syslog Default value is False
= syslogWhich syslog facility to use. Valid values include auth, authpriv, syslog, user0, user1... Default value is 'syslog'
= ERRORWhich messages to log. INFO means log all usage ERROR means only log unsuccessful attempts
-
diff --git a/doc/common/tables/ceilometer-testing.xml b/doc/common/tables/ceilometer-testing.xml deleted file mode 100644 index af427e42a5..0000000000 --- a/doc/common/tables/ceilometer-testing.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
Description of testing configuration options
Configuration option = Default valueDescription
[DEFAULT]
= False(BoolOpt) Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake
-
diff --git a/doc/common/tables/cinder-drbd.xml b/doc/common/tables/cinder-drbd.xml deleted file mode 100644 index 4ac957b3f5..0000000000 --- a/doc/common/tables/cinder-drbd.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
Description of DRBD configuration options
Configuration option = Default valueDescription
[DEFAULT]
= 1(StrOpt) Number of nodes that should replicate the data.
-
diff --git a/doc/common/tables/cinder-fujitsu_eternus_dx.xml b/doc/common/tables/cinder-fujitsu_eternus_dx.xml deleted file mode 100644 index 091ea8c73b..0000000000 --- a/doc/common/tables/cinder-fujitsu_eternus_dx.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
Description of Fujitsu ETERNUS DX volume driver configuration options
Configuration option = Default valueDescription
[DEFAULT]
= /etc/cinder/cinder_fujitsu_eternus_dx.xml(StrOpt) The configuration file for the Cinder SMI-S driver
-
diff --git a/doc/common/tables/cinder-fusionio.xml b/doc/common/tables/cinder-fusionio.xml deleted file mode 100644 index 787893b4d1..0000000000 --- a/doc/common/tables/cinder-fusionio.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of Fusion-io driver configuration options
Configuration option = Default valueDescription
[DEFAULT]
= 3(IntOpt) number of retries for GET operations
= 5(IntOpt) amount of time wait for iSCSI target to come online
= True(BoolOpt) verify the array certificate on each transaction
-
diff --git a/doc/common/tables/cinder-hpmsa.xml b/doc/common/tables/cinder-hpmsa.xml deleted file mode 100644 index bcc44bcfd8..0000000000 --- a/doc/common/tables/cinder-hpmsa.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
Description of HP MSA Fiber Channel driver configuration options
Configuration option = Default valueDescription
[DEFAULT]
= OpenStack(StrOpt) The VDisk to use for volume creation.
-
diff --git a/doc/common/tables/cinder-rootwrap.xml b/doc/common/tables/cinder-rootwrap.xml deleted file mode 100644 index 46eecc28b4..0000000000 --- a/doc/common/tables/cinder-rootwrap.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of rootwrap configuration options
Configuration option = Default valueDescription
[DEFAULT]
= /etc/cinder/rootwrap.d,/usr/share/cinder/rootwrapList of directories to load filter definitions from (separated by ','). These directories MUST all be only writeable by root !
= /sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbinList of directories to search executables in, in case filters do not explicitely specify a full path (separated by ',') If not specified, defaults to system PATH environment variable. These directories MUST all be only writeable by root !
= FalseEnable logging to syslog Default value is False
= syslogWhich syslog facility to use. Valid values include auth, authpriv, syslog, local0, local1... Default value is 'syslog'
= ERRORWhich messages to log. INFO means log all usage ERROR means only log unsuccessful attempts
-
diff --git a/doc/common/tables/cinder-san-solaris.xml b/doc/common/tables/cinder-san-solaris.xml deleted file mode 100644 index d46779d325..0000000000 --- a/doc/common/tables/cinder-san-solaris.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
Description of Solaris SAN configuration options
Configuration option = Default valueDescription
[DEFAULT]
= rpool/(StrOpt) The ZFS path under which to create zvols for volumes.
-
diff --git a/doc/common/tables/cinder-testing.xml b/doc/common/tables/cinder-testing.xml deleted file mode 100644 index a9251589dd..0000000000 --- a/doc/common/tables/cinder-testing.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
Description of testing configuration options
Configuration option = Default valueDescription
[DEFAULT]
= False(BoolOpt) Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake
-
diff --git a/doc/common/tables/ironic-rootwrap.xml b/doc/common/tables/ironic-rootwrap.xml deleted file mode 100644 index a44611d62b..0000000000 --- a/doc/common/tables/ironic-rootwrap.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of rootwrap configuration options
Configuration option = Default valueDescription
[DEFAULT]
= /etc/ironic/rootwrap.d,/usr/share/ironic/rootwrapList of directories to load filter definitions from (separated by ','). These directories MUST all be only writeable by root !
= /sbin,/usr/sbin,/bin,/usr/binList of directories to search executables in, in case filters do not explicitely specify a full path (separated by ',') If not specified, defaults to system PATH environment variable. These directories MUST all be only writeable by root !
= FalseEnable logging to syslog Default value is False
= syslogWhich syslog facility to use. Valid values include auth, authpriv, syslog, user0, user1... Default value is 'syslog'
= ERRORWhich messages to log. INFO means log all usage ERROR means only log unsuccessful attempts
-
diff --git a/doc/common/tables/keystone-testing.xml b/doc/common/tables/keystone-testing.xml deleted file mode 100644 index b324ed348b..0000000000 --- a/doc/common/tables/keystone-testing.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
Description of testing configuration options
Configuration option = Default valueDescription
[DEFAULT]
= False(BoolOpt) Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake
-
diff --git a/doc/common/tables/neutron-cfg_agent.xml b/doc/common/tables/neutron-cfg_agent.xml deleted file mode 100644 index 5a9e95cf4e..0000000000 --- a/doc/common/tables/neutron-cfg_agent.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of cfg agent configuration options
Configuration option = Default valueDescription
[cfg_agent]
= 30(IntOpt) Time in seconds for connecting to a hosting device
= 300(IntOpt) The time in seconds until a backlogged hosting device is presumed dead. This value should be set up high enough to recover from a period of connectivity loss or high load when the device may not be responding.
= neutron.plugins.cisco.cfg_agent.service_helpers.routing_svc_helper.RoutingServiceHelper(StrOpt) Path of the routing service helper class.
= 10(IntOpt) Interval when the process_services() loop executes in seconds. This is when the config agent lets each service helper to process its neutron resources.
-
diff --git a/doc/common/tables/neutron-l3_brocade_mlx_switch.xml b/doc/common/tables/neutron-l3_brocade_mlx_switch.xml deleted file mode 100644 index 2e9f818384..0000000000 --- a/doc/common/tables/neutron-l3_brocade_mlx_switch.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of Brocade MLX L3 switch configuration options
Configuration option = Default valueDescription
[L3_BROCADE_MLX_EXAMPLE]
= (StrOpt) The IP address of the MLX switch
= password(StrOpt) The SSH password of the switch
= (StrOpt) Allowed physical networks where VLAN can be configured on this switch
= (StrOpt) Ports to be tagged in the VLAN being configured on the switch
= admin(StrOpt) The SSH username of the switch
-
diff --git a/doc/common/tables/neutron-ml2_brocade_fi_ni_switch.xml b/doc/common/tables/neutron-ml2_brocade_fi_ni_switch.xml deleted file mode 100644 index de2fc05817..0000000000 --- a/doc/common/tables/neutron-ml2_brocade_fi_ni_switch.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of ML2 Brocade MLX ICX switch configuration options
Configuration option = Default valueDescription
[ML2_BROCADE_MLX_EXAMPLE]
= (StrOpt) The address of the host to SSH to
= NI(StrOpt) OS type of the device.
= password(StrOpt) The SSH password to use
= (StrOpt) Allowed physical networks
= (StrOpt) Ports
= SSH(StrOpt) Protocol used to communicate with Switch
= admin(StrOpt) The SSH username to use
-
diff --git a/doc/common/tables/neutron-mlnx.xml b/doc/common/tables/neutron-mlnx.xml deleted file mode 100644 index 0ee428f5f5..0000000000 --- a/doc/common/tables/neutron-mlnx.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of Mellanox configuration options
Configuration option = Default valueDescription
[ESWITCH]
= 2(IntOpt) backoff rate multiplier for waiting period between retries for request to daemon, i.e. value of 2 will double the request timeout each retry
= tcp://127.0.0.1:60001(StrOpt) eswitch daemon end point
= (ListOpt) List of <physical_network>:<physical_interface>
= 3000(IntOpt) The number of milliseconds the agent will wait for response on request to daemon.
-
diff --git a/doc/common/tables/neutron-nuage.xml b/doc/common/tables/neutron-nuage.xml deleted file mode 100644 index 7f3819a9a5..0000000000 --- a/doc/common/tables/neutron-nuage.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of Nuage configuration options
Configuration option = Default valueDescription
[RESTPROXY]
= (StrOpt) Nuage provided uri for initial authorization to access VSD
= /(StrOpt) Nuage provided base uri to reach out to VSD
= 254(IntOpt) Per Net Partition quota of floating ips
= OpenStackDefaultNetPartition(StrOpt) Default Network partition in which VSD will orchestrate network resources using openstack
= system(StrOpt) Organization name in which VSD will orchestrate network resources using openstack
= localhost:8800(StrOpt) IP Address and Port of Nuage's VSD server
= username:password(StrOpt) Username and password for authentication
= False(BoolOpt) Boolean for SSL connection with VSD server
[SYNCMANAGER]
= False(BoolOpt) Nuage plugin will sync resources between openstack and VSD
= 0(IntOpt) Sync interval in seconds between openstack and VSD. It defines how often the synchronization is done. If not set, value of 0 is assumed and sync will be performed only once, at the Neutron startup time.
-
diff --git a/doc/common/tables/neutron-rootwrap.xml b/doc/common/tables/neutron-rootwrap.xml deleted file mode 100644 index 814f536d4d..0000000000 --- a/doc/common/tables/neutron-rootwrap.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of rootwrap configuration options
Configuration option = Default valueDescription
[DEFAULT]
= /etc/neutron/rootwrap.d,/usr/share/neutron/rootwrapList of directories to load filter definitions from (separated by ','). These directories MUST all be only writeable by root !
= /sbin,/usr/sbin,/bin,/usr/binList of directories to search executables in, in case filters do not explicitely specify a full path (separated by ',') If not specified, defaults to system PATH environment variable. These directories MUST all be only writeable by root !
= FalseEnable logging to syslog Default value is False
= syslogWhich syslog facility to use. Valid values include auth, authpriv, syslog, local0, local1... Default value is 'syslog'
= ERRORWhich messages to log. INFO means log all usage ERROR means only log unsuccessful attempts
[xenapi]
= <None>XenAPI configuration is only required by the L2 agent if it is to target a XenServer/XCP compute host's dom0.
= rootNo help text available for this option.
= <None>No help text available for this option.
-
diff --git a/doc/common/tables/neutron-ryu.xml b/doc/common/tables/neutron-ryu.xml deleted file mode 100644 index 6de8ae8068..0000000000 --- a/doc/common/tables/neutron-ryu.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of RYU configuration options
Configuration option = Default valueDescription
[DEFAULT]
= (StrOpt) webapp listen host
= 8080(IntOpt) webapp listen port
-
diff --git a/doc/common/tables/neutron-testing.xml b/doc/common/tables/neutron-testing.xml deleted file mode 100644 index 3f064f76ec..0000000000 --- a/doc/common/tables/neutron-testing.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
Description of testing configuration options
Configuration option = Default valueDescription
[DEFAULT]
= False(BoolOpt) Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake
-
diff --git a/doc/common/tables/nova-rootwrap.xml b/doc/common/tables/nova-rootwrap.xml deleted file mode 100644 index 982fc5f5c6..0000000000 --- a/doc/common/tables/nova-rootwrap.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of rootwrap configuration options
Configuration option = Default valueDescription
[DEFAULT]
= /etc/nova/rootwrap.d,/usr/share/nova/rootwrapList of directories to load filter definitions from (separated by ','). These directories MUST all be only writeable by root !
= /sbin,/usr/sbin,/bin,/usr/binList of directories to search executables in, in case filters do not explicitely specify a full path (separated by ',') If not specified, defaults to system PATH environment variable. These directories MUST all be only writeable by root !
= FalseEnable logging to syslog Default value is False
= syslogWhich syslog facility to use. Valid values include auth, authpriv, syslog, local0, local1... Default value is 'syslog'
= ERRORWhich messages to log. INFO means log all usage ERROR means only log unsuccessful attempts
-
diff --git a/doc/common/tables/sahara-rootwrap.xml b/doc/common/tables/sahara-rootwrap.xml deleted file mode 100644 index b002bce36d..0000000000 --- a/doc/common/tables/sahara-rootwrap.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of rootwrap configuration options
Configuration option = Default valueDescription
[DEFAULT]
= /etc/sahara/rootwrap.dList of directories to load filter definitions from (separated by ','). These directories MUST all be only writeable by root !
= /sbin,/usr/sbin,/bin,/usr/binList of directories to search executables in, in case filters do not explicitely specify a full path (separated by ',') If not specified, defaults to system PATH environment variable. These directories MUST all be only writeable by root !
= FalseEnable logging to syslog Default value is False
= syslogWhich syslog facility to use. Valid values include auth, authpriv, syslog, local0, local1... Default value is 'syslog'
= ERRORWhich messages to log. INFO means log all usage ERROR means only log unsuccessful attempts
[xenapi]
= <None>XenAPI configuration is only required by the L2 agent if it is to target a XenServer/XCP compute host's dom0.
= rootNo help text available for this option.
= <None>No help text available for this option.
-
diff --git a/doc/common/tables/sahara-testing.xml b/doc/common/tables/sahara-testing.xml deleted file mode 100644 index 7bb841e8db..0000000000 --- a/doc/common/tables/sahara-testing.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
Description of testing configuration options
Configuration option = Default valueDescription
[DEFAULT]
= False(BoolOpt) Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake
-
diff --git a/doc/common/tables/trove-testing.xml b/doc/common/tables/trove-testing.xml deleted file mode 100644 index 6620183621..0000000000 --- a/doc/common/tables/trove-testing.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
Description of testing configuration options
Configuration option = Default valueDescription
[DEFAULT]
= False(BoolOpt) Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake
-
diff --git a/doc/config-reference/block-storage/section_misc.xml b/doc/config-reference/block-storage/section_misc.xml index 4f30ae9cb6..cea54a39ea 100644 --- a/doc/config-reference/block-storage/section_misc.xml +++ b/doc/config-reference/block-storage/section_misc.xml @@ -14,7 +14,6 @@ - @@ -25,8 +24,6 @@ - - @@ -44,20 +41,13 @@ - - - diff --git a/doc/config-reference/ch_baremetalconfigure.xml b/doc/config-reference/ch_baremetalconfigure.xml index bd2fc3f197..27ea1bc2f4 100644 --- a/doc/config-reference/ch_baremetalconfigure.xml +++ b/doc/config-reference/ch_baremetalconfigure.xml @@ -36,7 +36,6 @@ - diff --git a/doc/config-reference/ch_databaseserviceconfigure.xml b/doc/config-reference/ch_databaseserviceconfigure.xml index 5c3451b5fb..2b42afc05c 100644 --- a/doc/config-reference/ch_databaseserviceconfigure.xml +++ b/doc/config-reference/ch_databaseserviceconfigure.xml @@ -29,7 +29,6 @@ - diff --git a/doc/config-reference/ch_dataprocessingserviceconfigure.xml b/doc/config-reference/ch_dataprocessingserviceconfigure.xml index 60164d45de..d2e5c538d9 100644 --- a/doc/config-reference/ch_dataprocessingserviceconfigure.xml +++ b/doc/config-reference/ch_dataprocessingserviceconfigure.xml @@ -25,9 +25,7 @@ - - diff --git a/doc/config-reference/ch_identityconfigure.xml b/doc/config-reference/ch_identityconfigure.xml index 5708e9e833..1a80751999 100644 --- a/doc/config-reference/ch_identityconfigure.xml +++ b/doc/config-reference/ch_identityconfigure.xml @@ -80,7 +80,6 @@ options. For installation prerequisites and step-by-step walkthroughs, see the - diff --git a/doc/config-reference/ch_telemetryconfigure.xml b/doc/config-reference/ch_telemetryconfigure.xml index 4b82e61c15..64b6ea60c8 100644 --- a/doc/config-reference/ch_telemetryconfigure.xml +++ b/doc/config-reference/ch_telemetryconfigure.xml @@ -39,11 +39,9 @@ - - diff --git a/doc/config-reference/compute/section_compute-options-reference.xml b/doc/config-reference/compute/section_compute-options-reference.xml index 044e2f9a35..57d31e37b5 100644 --- a/doc/config-reference/compute/section_compute-options-reference.xml +++ b/doc/config-reference/compute/section_compute-options-reference.xml @@ -46,7 +46,6 @@ - diff --git a/doc/config-reference/networking/section_networking-options-reference.xml b/doc/config-reference/networking/section_networking-options-reference.xml index 590fa40f9e..4c22dcade3 100644 --- a/doc/config-reference/networking/section_networking-options-reference.xml +++ b/doc/config-reference/networking/section_networking-options-reference.xml @@ -138,13 +138,6 @@ -
-Rootwrap -Use the following options in the -neutron.conf file for the rootwrap settings - -
-
Scheduler Use the following options in the @@ -191,10 +184,4 @@ for your driver to change security group settings.
-
-Testing -Use the following options to alter testing-related features. - -
- diff --git a/doc/config-reference/networking/section_networking-plugins-ml2.xml b/doc/config-reference/networking/section_networking-plugins-ml2.xml index 5a615514ce..9f03fcbf6b 100644 --- a/doc/config-reference/networking/section_networking-plugins-ml2.xml +++ b/doc/config-reference/networking/section_networking-plugins-ml2.xml @@ -79,15 +79,6 @@ Configure switch names to be used as group names as described below - Configure MLX and ICX switch options in the form of switch - groups as described in the example below: - - - Define a switch group for each MLX and ICX switch using the switch - names used in configuration - option as a group name. - -
Modular Layer 2 (ml2) Cisco Mechanism configuration diff --git a/doc/config-reference/networking/section_networking-plugins.xml b/doc/config-reference/networking/section_networking-plugins.xml index f63647c427..6255e66fad 100644 --- a/doc/config-reference/networking/section_networking-plugins.xml +++ b/doc/config-reference/networking/section_networking-plugins.xml @@ -46,17 +46,6 @@ <xi:include href="../../common/tables/neutron-l3_brocade_mlx.xml" /> - <para>Configure MLX switch options in the form of switch - groups as described in the example below:</para> - <xi:include - href="../../common/tables/neutron-l3_brocade_mlx_switch.xml" - /> - <note> - <para>Define a switch group for each switch using the switch - names used in <option>switch_names</option> configuration - option as a group name. - </para> - </note> </section> <section xml:id="networking-plugin-brocade_vyatta_l3"> <title>Brocade Vyatta layer 3 plug-in @@ -74,9 +63,6 @@ -
CloudBase Hyper-V Agent configuration @@ -132,12 +118,6 @@ href="../../common/tables/neutron-nec.xml" /> </section> - <section xml:id="networking-plugin-nuage"> - <title>Nuage configuration options - -
One Convergence NVSD configuration options