From e3e2f639dd94428317bad3666bc09e054b62d08a Mon Sep 17 00:00:00 2001
From: Travis Truman <travis_truman@cable.comcast.com>
Date: Tue, 17 May 2016 11:24:30 -0400
Subject: [PATCH] Verbose option has been deprecated from oslo.log

See http://lists.openstack.org/pipermail/openstack-dev/2016-May/095166.html
for additional details.

Change-Id: I8b7155cd36b0140403df0598a2376d4e6ea91d6b
---
 defaults/main.yml               | 1 -
 templates/dhcp_agent.ini.j2     | 1 -
 templates/l3_agent.ini.j2       | 1 -
 templates/lbaas_agent.ini.j2    | 1 -
 templates/metadata_agent.ini.j2 | 1 -
 templates/metering_agent.ini.j2 | 1 -
 templates/neutron.conf.j2       | 1 -
 tests/test-vars.yml             | 1 -
 8 files changed, 8 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 15c55f22..6e15d5be 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -18,7 +18,6 @@ is_metal: true
 
 ## Verbosity Options
 debug: False
-verbose: True
 
 neutron_git_repo: https://git.openstack.org/openstack/neutron
 neutron_git_install_branch: master
diff --git a/templates/dhcp_agent.ini.j2 b/templates/dhcp_agent.ini.j2
index 637bf6ed..364b492a 100644
--- a/templates/dhcp_agent.ini.j2
+++ b/templates/dhcp_agent.ini.j2
@@ -5,7 +5,6 @@
 
 # General
 [DEFAULT]
-verbose = {{ verbose }}
 debug = {{ debug }}
 
 num_sync_threads = {{ neutron_num_sync_threads | default(api_threads) }}
diff --git a/templates/l3_agent.ini.j2 b/templates/l3_agent.ini.j2
index 8aac0f19..1368d523 100644
--- a/templates/l3_agent.ini.j2
+++ b/templates/l3_agent.ini.j2
@@ -2,7 +2,6 @@
 
 # General
 [DEFAULT]
-verbose = {{ verbose }}
 debug = {{ debug }}
 
 # While this option is deprecated in Liberty, if we remove it then it takes
diff --git a/templates/lbaas_agent.ini.j2 b/templates/lbaas_agent.ini.j2
index 980412eb..0809b4d1 100644
--- a/templates/lbaas_agent.ini.j2
+++ b/templates/lbaas_agent.ini.j2
@@ -2,7 +2,6 @@
 
 [DEFAULT]
 # Show debugging output in log (sets DEBUG log level output).
-verbose = {{ verbose | bool }}
 debug = {{ debug | bool }}
 
 # The LBaaS agent will resync its state with Neutron to recover from any
diff --git a/templates/metadata_agent.ini.j2 b/templates/metadata_agent.ini.j2
index 0f581a57..ebe6ac30 100644
--- a/templates/metadata_agent.ini.j2
+++ b/templates/metadata_agent.ini.j2
@@ -5,7 +5,6 @@
 
 # General
 [DEFAULT]
-verbose = {{ verbose }}
 debug = {{ debug }}
 
 # Neutron credentials for API access
diff --git a/templates/metering_agent.ini.j2 b/templates/metering_agent.ini.j2
index ad69e5d1..0a461af6 100644
--- a/templates/metering_agent.ini.j2
+++ b/templates/metering_agent.ini.j2
@@ -2,7 +2,6 @@
 
 # General
 [DEFAULT]
-verbose = {{ verbose }}
 debug = {{ debug }}
 
 # Drivers
diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2
index b4a421ae..d1ef46c1 100644
--- a/templates/neutron.conf.j2
+++ b/templates/neutron.conf.j2
@@ -5,7 +5,6 @@
 
 # General, applies to all host groups
 [DEFAULT]
-verbose = {{ verbose }}
 debug = {{ debug }}
 fatal_deprecations = {{ neutron_fatal_deprecations }}
 log_file = /var/log/neutron/neutron.log
diff --git a/tests/test-vars.yml b/tests/test-vars.yml
index 3a1683cc..ce38fd5a 100644
--- a/tests/test-vars.yml
+++ b/tests/test-vars.yml
@@ -62,4 +62,3 @@ openrc_os_password: "{{ keystone_auth_admin_password }}"
 rabbitmq_port: 5671
 rabbitmq_servers: 10.100.100.2
 rabbitmq_use_ssl: true
-verbose: true