From d8a54c8e56a9b507e30700cdac870bbe4606d4a0 Mon Sep 17 00:00:00 2001 From: Jens Rosenboom Date: Fri, 8 Apr 2016 15:59:49 +0200 Subject: [PATCH] Remove the deprecated "verbose" option The option "verbose" in the [DEFAULT] section is deprecated, it's default value would be false anyway. Change-Id: Ib7809425ca5c1651cd7642f3a6cf56cb7f6444aa --- README.md | 3 +-- attributes/keystone_conf.rb | 1 - spec/server-apache_spec.rb | 9 --------- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/README.md b/README.md index 95cd5e8..ff5174b 100644 --- a/README.md +++ b/README.md @@ -244,6 +244,7 @@ Create EC2 credentials for a given user in the specified tenant Attributes ========== +**TODO**: Clean up after refactoring. Please refer to the Common cookbook for more attributes. * `openstack['identity']['db_server_chef_role']` - The name of the Chef role that knows about the db server @@ -254,8 +255,6 @@ Please refer to the Common cookbook for more attributes. * `openstack['identity']['db_passwd']` - Password for keystone database access * `openstack['identity']['db_ipaddress']` - IP address of the keystone database * `openstack['identity']['api_ipaddress']` - IP address for the keystone API to bind to. _TODO_: Rename to bind_address -* `openstack['identity']['verbose']` - Enables/disables verbose output for keystone API server -* `openstack['identity']['debug']` - Enables/disables debug output for keystone API server * `openstack['identity']['admin_token']` - Admin token for bootstraping keystone server * `openstack['identity']['admin_workers']` - The number of worker processes to serve the admin WSGI application * `openstack['identity']['public_workers']` - The number of worker processes to serve the public WSGI application diff --git a/attributes/keystone_conf.rb b/attributes/keystone_conf.rb index cee8468..5dcc84c 100644 --- a/attributes/keystone_conf.rb +++ b/attributes/keystone_conf.rb @@ -1,7 +1,6 @@ default['openstack']['identity']['conf_secrets'] = {} default['openstack']['identity']['conf'].tap do |conf| # [DEFAULT] - conf['DEFAULT']['verbose'] = false # true in docs if node['openstack']['identity']['syslog']['use'] conf['DEFAULT']['log_config_append'] = '/etc/openstack/logging.conf' else diff --git a/spec/server-apache_spec.rb b/spec/server-apache_spec.rb index 245e98e..f2368d2 100644 --- a/spec/server-apache_spec.rb +++ b/spec/server-apache_spec.rb @@ -140,15 +140,6 @@ describe 'openstack-identity::server-apache' do expect(chef_run).to render_config_file(path).with_section_content('DEFAULT', r) end - describe 'logging verbosity' do - ['verbose'].each do |x| - it "has #{x} option" do - r = line_regexp("#{x} = false") - expect(chef_run).to render_config_file(path).with_section_content('DEFAULT', r) - end - end - end - describe 'syslog configuration' do log_file = %r{^log_dir = /var/log/keystone$} log_conf = %r{^log_config_append = /\w+}