From 316561e8a983d3bba95c1dadcecd8b07a0a4024c Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 6 Apr 2016 12:47:24 +0200 Subject: [PATCH] Remove references to 'verbose' logging option This option is deprecated and will be removed in next oslo.log releases: https://github.com/openstack/oslo.log/blob/ef9f69f35ed6aaccb9bdfc8d688124c510f7a2e2/oslo_log/_options.py#L44 Change-Id: Ifc490efc49f81a517bd19adc79cfd765aa6c8368 --- .../source/compute-manage-logs.rst | 5 ++--- .../source/identity_troubleshoot.rst | 7 +++---- .../networking_adv-operational-features.rst | 4 ---- .../source/networking_config-agents.rst | 1 - .../drivers/windows-iscsi-volume-driver.rst | 1 - .../source/compute/hypervisor-hyper-v.rst | 1 - doc/config-reference/source/compute/nova.conf | 3 +-- doc/config-reference/source/config-format.rst | 3 --- doc/install-guide/source/ceilometer-aodh.rst | 9 --------- .../source/ceilometer-install.rst | 9 --------- doc/install-guide/source/ceilometer-nova.rst | 9 --------- .../source/nova-compute-install.rst | 9 --------- .../source/nova-controller-install.rst | 9 --------- .../source/scenario-classic-lb.rst | 18 ----------------- .../source/scenario-classic-mt.rst | 8 -------- .../source/scenario-classic-ovs.rst | 18 ----------------- .../source/scenario-dvr-ovs.rst | 20 ------------------- .../source/scenario-l3ha-lb.rst | 18 ----------------- .../source/scenario-l3ha-ovs.rst | 18 ----------------- .../source/scenario-provider-lb.rst | 9 --------- .../source/scenario-provider-ovs.rst | 9 --------- 21 files changed, 6 insertions(+), 182 deletions(-) diff --git a/doc/admin-guide/source/compute-manage-logs.rst b/doc/admin-guide/source/compute-manage-logs.rst index a83bf2ba8f..03929e5c2e 100644 --- a/doc/admin-guide/source/compute-manage-logs.rst +++ b/doc/admin-guide/source/compute-manage-logs.rst @@ -65,13 +65,12 @@ In each configuration file, add these lines: .. code-block:: ini - verbose = False debug = False use_syslog = True syslog_log_facility = LOG_LOCAL0 -In addition to enabling syslog, these settings also turn off verbose and -debugging output from the log. +In addition to enabling syslog, these settings also turn off debugging output +from the log. .. note:: diff --git a/doc/admin-guide/source/identity_troubleshoot.rst b/doc/admin-guide/source/identity_troubleshoot.rst index a0c7e43784..cc4a47051f 100644 --- a/doc/admin-guide/source/identity_troubleshoot.rst +++ b/doc/admin-guide/source/identity_troubleshoot.rst @@ -95,10 +95,9 @@ are not. One possible problem is that the certificates are the wrong files or garbage. You can remove these files and run another command against your server; they are fetched on demand. -The Identity service log should show the access of the certificate -files. You might have to turn up your logging levels. Set -``debug = True`` and ``verbose = True`` in your Identity configuration -file and restart the Identity server. +The Identity service log should show the access of the certificate files. You +might have to turn up your logging levels. Set ``debug = True`` in your +Identity configuration file and restart the Identity server. .. code-block:: console diff --git a/doc/admin-guide/source/networking_adv-operational-features.rst b/doc/admin-guide/source/networking_adv-operational-features.rst index dadac7a83a..f3afcb65b4 100644 --- a/doc/admin-guide/source/networking_adv-operational-features.rst +++ b/doc/admin-guide/source/networking_adv-operational-features.rst @@ -27,10 +27,6 @@ methods: # Show debugging output in logs (sets DEBUG log level output) # debug = False - # Show more verbose log output (sets INFO log level output) if debug - is False - # verbose = False - # log_date_format = %Y-%m-%d %H:%M:%S # use_syslog = False diff --git a/doc/admin-guide/source/networking_config-agents.rst b/doc/admin-guide/source/networking_config-agents.rst index 49e4c3a85c..64b6d45b96 100644 --- a/doc/admin-guide/source/networking_config-agents.rst +++ b/doc/admin-guide/source/networking_config-agents.rst @@ -453,7 +453,6 @@ correctly using these .. code-block:: ini [DEFAULT] - verbose = true control_exchange = neutron policy_file = C:\etc\policy.json rpc_backend = neutron.openstack.common.rpc.impl_kombu diff --git a/doc/config-reference/source/block-storage/drivers/windows-iscsi-volume-driver.rst b/doc/config-reference/source/block-storage/drivers/windows-iscsi-volume-driver.rst index 505f9a4d03..ade8063c4b 100644 --- a/doc/config-reference/source/block-storage/drivers/windows-iscsi-volume-driver.rst +++ b/doc/config-reference/source/block-storage/drivers/windows-iscsi-volume-driver.rst @@ -99,7 +99,6 @@ configuration sample for using the Windows iSCSI Driver: rabbit_port = 5672 sql_connection = mysql+pymysql://root:Passw0rd@IP_ADDRESS/cinder windows_iscsi_lun_path = C:\iSCSIVirtualDisks - verbose = True rabbit_password = Passw0rd logdir = C:\OpenStack\Log\ image_conversion_dir = C:\ImageConversionDir diff --git a/doc/config-reference/source/compute/hypervisor-hyper-v.rst b/doc/config-reference/source/compute/hypervisor-hyper-v.rst index 1fc3da7277..cac95d6ef2 100644 --- a/doc/config-reference/source/compute/hypervisor-hyper-v.rst +++ b/doc/config-reference/source/compute/hypervisor-hyper-v.rst @@ -341,7 +341,6 @@ OpenStack on Hyper-V. Below is a sample ``nova.conf`` for Windows: injected_network_template = C:\Program Files (x86)\OpenStack\Nova\etc\interfaces.template policy_file = C:\Program Files (x86)\OpenStack\Nova\etc\policy.json mkisofs_cmd = C:\Program Files (x86)\OpenStack\Nova\bin\mkisofs.exe - verbose = false allow_resize_to_same_host = true running_deleted_instance_action = reap running_deleted_instance_poll_interval = 120 diff --git a/doc/config-reference/source/compute/nova.conf b/doc/config-reference/source/compute/nova.conf index d147ae5740..08e2c49c8b 100644 --- a/doc/config-reference/source/compute/nova.conf +++ b/doc/config-reference/source/compute/nova.conf @@ -1,7 +1,6 @@ [DEFAULT] # LOGS/STATE -verbose=True logdir=/var/log/nova state_path=/var/lib/nova lock_path=/var/lock/nova @@ -72,4 +71,4 @@ connection=mysql+pymysql://nova:yourpassword@192.168.206.130/nova # LIBVIRT [libvirt] -virt_type=qemu \ No newline at end of file +virt_type=qemu diff --git a/doc/config-reference/source/config-format.rst b/doc/config-reference/source/config-format.rst index 6458cd3fc4..14a59ca7e7 100644 --- a/doc/config-reference/source/config-format.rst +++ b/doc/config-reference/source/config-format.rst @@ -15,9 +15,6 @@ For example: # Print debugging output (set logging level to DEBUG instead # of default WARNING level). (boolean value) debug = true - # Print more verbose output (set logging level to INFO instead - # of default WARNING level). (boolean value) - verbose = true [database] # The SQLAlchemy connection string used to connect to the diff --git a/doc/install-guide/source/ceilometer-aodh.rst b/doc/install-guide/source/ceilometer-aodh.rst index beeeacf38f..fb58bfdd52 100644 --- a/doc/install-guide/source/ceilometer-aodh.rst +++ b/doc/install-guide/source/ceilometer-aodh.rst @@ -259,15 +259,6 @@ Install and configure components Replace ``AODH_PASS`` with the password you chose for the ``aodh`` user in the Identity service. - * (Optional) To assist with troubleshooting, enable verbose - logging in the ``[DEFAULT]`` section: - - .. code-block:: ini - - [DEFAULT] - ... - verbose = True - .. todo: Workaround for https://bugs.launchpad.net/ubuntu/+source/aodh/+bug/1513599. diff --git a/doc/install-guide/source/ceilometer-install.rst b/doc/install-guide/source/ceilometer-install.rst index 33bfb19e5d..82e870ae30 100644 --- a/doc/install-guide/source/ceilometer-install.rst +++ b/doc/install-guide/source/ceilometer-install.rst @@ -296,15 +296,6 @@ Install and configure components ... dispatcher = database - * (Optional) To assist with troubleshooting, enable verbose - logging in the ``[DEFAULT]`` section: - - .. code-block:: ini - - [DEFAULT] - ... - verbose = True - Finalize installation --------------------- diff --git a/doc/install-guide/source/ceilometer-nova.rst b/doc/install-guide/source/ceilometer-nova.rst index 4d0980e525..7a4d12fba4 100644 --- a/doc/install-guide/source/ceilometer-nova.rst +++ b/doc/install-guide/source/ceilometer-nova.rst @@ -93,15 +93,6 @@ Install and configure components Replace ``CEILOMETER_PASS`` with the password you chose for the ``ceilometer`` user in the Identity service. - * (Optional) To assist with troubleshooting, enable verbose - logging in the ``[DEFAULT]`` section: - - .. code-block:: ini - - [DEFAULT] - ... - verbose = True - Configure Compute to use Telemetry ---------------------------------- diff --git a/doc/install-guide/source/nova-compute-install.rst b/doc/install-guide/source/nova-compute-install.rst index dc3d4d727c..2fc726b693 100644 --- a/doc/install-guide/source/nova-compute-install.rst +++ b/doc/install-guide/source/nova-compute-install.rst @@ -221,15 +221,6 @@ Install and configure components * Due to a packaging bug, remove the ``logdir`` option from the ``[DEFAULT]`` section. - * In the ``[DEFAULT]`` section, enable verbose mode to assist with - potential troubleshooting: - - .. code-block:: ini - - [DEFAULT] - ... - verbose = True - .. only:: obs or debian 3. Ensure the kernel module ``nbd`` is loaded. diff --git a/doc/install-guide/source/nova-controller-install.rst b/doc/install-guide/source/nova-controller-install.rst index b536517d0d..bba98bd904 100644 --- a/doc/install-guide/source/nova-controller-install.rst +++ b/doc/install-guide/source/nova-controller-install.rst @@ -388,15 +388,6 @@ Install and configure components * Due to a packaging bug, remove the ``logdir`` option from the ``[DEFAULT]`` section. - * In the ``[DEFAULT]`` section, enable verbose mode to assist with - potential troubleshooting: - - .. code-block:: ini - - [DEFAULT] - ... - verbose = True - .. only:: rdo or ubuntu 3. Populate the Compute databases: diff --git a/doc/networking-guide/source/scenario-classic-lb.rst b/doc/networking-guide/source/scenario-classic-lb.rst index 79fab4f3d9..490ebbdaeb 100644 --- a/doc/networking-guide/source/scenario-classic-lb.rst +++ b/doc/networking-guide/source/scenario-classic-lb.rst @@ -542,7 +542,6 @@ Controller node .. code-block:: ini [DEFAULT] - verbose = True core_plugin = ml2 service_plugins = router allow_overlapping_ips = True @@ -591,13 +590,6 @@ Controller node Network node ------------ -#. Configure common options. Edit the ``/etc/neutron/neutron.conf`` file: - - .. code-block:: ini - - [DEFAULT] - verbose = True - #. Configure the Linux bridge agent. Edit the ``/etc/neutron/plugins/ml2/linuxbridge_agent.ini`` file: @@ -628,7 +620,6 @@ Network node .. code-block:: ini [DEFAULT] - verbose = True interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver external_network_bridge = @@ -643,7 +634,6 @@ Network node .. code-block:: ini [DEFAULT] - verbose = True interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq enable_isolated_metadata = True @@ -669,7 +659,6 @@ Network node .. code-block:: ini [DEFAULT] - verbose = True nova_metadata_ip = controller metadata_proxy_shared_secret = METADATA_SECRET @@ -685,13 +674,6 @@ Network node Compute nodes ------------- -#. Configure common options. Edit the ``/etc/neutron/neutron.conf`` file: - - .. code-block:: ini - - [DEFAULT] - verbose = True - #. Configure the Linux bridge agent. Edit the ``/etc/neutron/plugins/ml2/linuxbridge_agent.ini`` file: diff --git a/doc/networking-guide/source/scenario-classic-mt.rst b/doc/networking-guide/source/scenario-classic-mt.rst index 9032c28ec1..a99e89bc1c 100644 --- a/doc/networking-guide/source/scenario-classic-mt.rst +++ b/doc/networking-guide/source/scenario-classic-mt.rst @@ -379,7 +379,6 @@ Controller node .. code-block:: ini [DEFAULT] - verbose = True core_plugin = ml2 service_plugins = router allow_overlapping_ips = True @@ -427,13 +426,6 @@ Network node Compute nodes ------------- -#. Configure common options. Edit the ``/etc/neutron/neutron.conf`` file: - - .. code-block:: ini - - [DEFAULT] - verbose = True - #. Configure the Macvtap agent. Edit the ``/etc/neutron/plugins/ml2/macvtap_agent.ini`` file: diff --git a/doc/networking-guide/source/scenario-classic-ovs.rst b/doc/networking-guide/source/scenario-classic-ovs.rst index c47a8eff0e..fbcf2e6d6d 100644 --- a/doc/networking-guide/source/scenario-classic-ovs.rst +++ b/doc/networking-guide/source/scenario-classic-ovs.rst @@ -643,7 +643,6 @@ Controller node .. code-block:: ini [DEFAULT] - verbose = True core_plugin = ml2 service_plugins = router allow_overlapping_ips = True @@ -695,13 +694,6 @@ Controller node Network node ------------ -#. Configure common options. Edit the ``/etc/neutron/neutron.conf`` file: - - .. code-block:: console - - [DEFAULT] - verbose = True - #. Configure the Open vSwitch agent. Edit the ``/etc/neutron/plugins/ml2/openvswitch_agent.ini`` file: @@ -728,7 +720,6 @@ Network node .. code-block:: ini [DEFAULT] - verbose = True interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver external_network_bridge = @@ -743,7 +734,6 @@ Network node .. code-block:: ini [DEFAULT] - verbose = True interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq enable_isolated_metadata = True @@ -769,7 +759,6 @@ Network node .. code-block:: ini [DEFAULT] - verbose = True nova_metadata_ip = controller metadata_proxy_shared_secret = METADATA_SECRET @@ -786,13 +775,6 @@ Network node Compute nodes ------------- -#. Configure common options. Edit the ``/etc/neutron/neutron.conf`` file: - - .. code-block:: ini - - [DEFAULT] - verbose = True - #. Configure the Open vSwitch agent. Edit the ``/etc/neutron/plugins/ml2/openvswitch_agent.ini`` file: diff --git a/doc/networking-guide/source/scenario-dvr-ovs.rst b/doc/networking-guide/source/scenario-dvr-ovs.rst index 7813ff82c7..74885d424c 100644 --- a/doc/networking-guide/source/scenario-dvr-ovs.rst +++ b/doc/networking-guide/source/scenario-dvr-ovs.rst @@ -487,7 +487,6 @@ Controller node .. code-block:: ini [DEFAULT] - verbose = True router_distributed = True core_plugin = ml2 service_plugins = router @@ -548,13 +547,6 @@ Controller node Network node ------------ -#. Configure common options. Edit the ``/etc/neutron/neutron.conf`` file: - - .. code-block:: ini - - [DEFAULT] - verbose = True - #. Configure the Open vSwitch agent. Edit the ``/etc/neutron/plugins/ml2/openvswitch_agent.ini`` file: @@ -583,7 +575,6 @@ Network node .. code-block:: ini [DEFAULT] - verbose = True interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver external_network_bridge = agent_mode = dvr_snat @@ -599,7 +590,6 @@ Network node .. code-block:: ini [DEFAULT] - verbose = True interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq enable_isolated_metadata = True @@ -625,7 +615,6 @@ Network node .. code-block:: ini [DEFAULT] - verbose = True nova_metadata_ip = controller metadata_proxy_shared_secret = METADATA_SECRET @@ -642,13 +631,6 @@ Network node Compute nodes ------------- -#. Configure common options. Edit the ``/etc/neutron/neutron.conf`` file: - - .. code-block:: ini - - [DEFAULT] - verbose = True - #. Configure the Open vSwitch agent. Edit the ``/etc/neutron/plugins/ml2/openvswitch_agent.ini`` file: @@ -677,7 +659,6 @@ Compute nodes .. code-block:: ini [DEFAULT] - verbose = True interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver external_network_bridge = agent_mode = dvr @@ -693,7 +674,6 @@ Compute nodes .. code-block:: ini [DEFAULT] - verbose = True nova_metadata_ip = controller metadata_proxy_shared_secret = METADATA_SECRET diff --git a/doc/networking-guide/source/scenario-l3ha-lb.rst b/doc/networking-guide/source/scenario-l3ha-lb.rst index fcb1ccadc3..64e7500e75 100644 --- a/doc/networking-guide/source/scenario-l3ha-lb.rst +++ b/doc/networking-guide/source/scenario-l3ha-lb.rst @@ -204,7 +204,6 @@ Controller node .. code-block:: ini [DEFAULT] - verbose = True core_plugin = ml2 service_plugins = router allow_overlapping_ips = True @@ -262,13 +261,6 @@ Network nodes #. Configure the kernel to enable packet forwarding and disable reverse path filtering. Edit the ``/etc/sysctl.conf`` file: -#. Configure common options. Edit the ``/etc/neutron/neutron.conf`` file: - - .. code-block:: ini - - [DEFAULT] - verbose = True - #. Configure the Linux bridge agent. Edit the ``/etc/neutron/plugins/ml2/linuxbridge_agent.ini`` file: @@ -299,7 +291,6 @@ Network nodes .. code-block:: ini [DEFAULT] - verbose = True interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver external_network_bridge = agent_mode = legacy @@ -315,7 +306,6 @@ Network nodes .. code-block:: ini [DEFAULT] - verbose = True interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq enable_isolated_metadata = True @@ -341,7 +331,6 @@ Network nodes .. code-block:: ini [DEFAULT] - verbose = True nova_metadata_ip = controller metadata_proxy_shared_secret = METADATA_SECRET @@ -357,13 +346,6 @@ Network nodes Compute nodes ------------- -#. Configure common options. Edit the ``/etc/neutron/neutron.conf`` file: - - .. code-block:: ini - - [DEFAULT] - verbose = True - #. Configure the Linux bridge agent. Edit the ``/etc/neutron/plugins/ml2/linuxbridge_agent.ini`` file: diff --git a/doc/networking-guide/source/scenario-l3ha-ovs.rst b/doc/networking-guide/source/scenario-l3ha-ovs.rst index 948a6244bc..916fdb00a5 100644 --- a/doc/networking-guide/source/scenario-l3ha-ovs.rst +++ b/doc/networking-guide/source/scenario-l3ha-ovs.rst @@ -215,7 +215,6 @@ Controller node .. code-block:: ini [DEFAULT] - verbose = True core_plugin = ml2 service_plugins = router allow_overlapping_ips = True @@ -273,13 +272,6 @@ Controller node Network nodes ------------- -#. Configure common options. Edit the ``/etc/neutron/neutron.conf`` file: - - .. code-block:: ini - - [DEFAULT] - verbose = True - #. Configure the Open vSwitch agent. Edit the ``/etc/neutron/plugins/ml2/openvswitch_agent.ini`` file: @@ -306,7 +298,6 @@ Network nodes .. code-block:: ini [DEFAULT] - verbose = True interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver external_network_bridge = agent_mode = legacy @@ -322,7 +313,6 @@ Network nodes .. code-block:: ini [DEFAULT] - verbose = True interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq enable_isolated_metadata = True @@ -348,7 +338,6 @@ Network nodes .. code-block:: ini [DEFAULT] - verbose = True nova_metadata_ip = controller metadata_proxy_shared_secret = METADATA_SECRET @@ -365,13 +354,6 @@ Network nodes Compute nodes ------------- -#. Configure common options. Edit the ``/etc/neutron/neutron.conf`` file: - - .. code-block:: ini - - [DEFAULT] - verbose = True - #. Configure the Open vSwitch agent. Edit the ``/etc/neutron/plugins/ml2/openvswitch_agent.ini`` file: diff --git a/doc/networking-guide/source/scenario-provider-lb.rst b/doc/networking-guide/source/scenario-provider-lb.rst index d62482f43c..3d408b2f42 100644 --- a/doc/networking-guide/source/scenario-provider-lb.rst +++ b/doc/networking-guide/source/scenario-provider-lb.rst @@ -369,7 +369,6 @@ Controller node .. code-block:: ini [DEFAULT] - verbose = True core_plugin = ml2 service_plugins = @@ -439,7 +438,6 @@ Controller node .. code-block:: ini [DEFAULT] - verbose = True interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq enable_isolated_metadata = True @@ -453,13 +451,6 @@ Controller node Compute nodes ------------- -#. Configure common options. Edit the ``/etc/neutron/neutron.conf`` file: - - .. code-block:: ini - - [DEFAULT] - verbose = True - #. Configure the Linux bridge agent. Edit the ``/etc/neutron/plugins/ml2/linuxbridge_agent.ini`` file: diff --git a/doc/networking-guide/source/scenario-provider-ovs.rst b/doc/networking-guide/source/scenario-provider-ovs.rst index 8ea354509f..7f5701d658 100644 --- a/doc/networking-guide/source/scenario-provider-ovs.rst +++ b/doc/networking-guide/source/scenario-provider-ovs.rst @@ -403,7 +403,6 @@ Controller node .. code-block:: ini [DEFAULT] - verbose = True core_plugin = ml2 service_plugins = @@ -467,7 +466,6 @@ Controller node .. code-block:: ini [DEFAULT] - verbose = True interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq enable_isolated_metadata = True @@ -501,13 +499,6 @@ Controller node Compute nodes ------------- -#. Configure common options. Edit the ``/etc/neutron/neutron.conf`` file: - - .. code-block:: ini - - [DEFAULT] - verbose = True - #. Configure the Open vSwitch agent. Edit the ``/etc/neutron/plugins/ml2/openvswitch_agent.ini`` file: