diff --git a/devstack/lib/tacker b/devstack/lib/tacker index 9cbc3017c..b2e0e3b6f 100644 --- a/devstack/lib/tacker +++ b/devstack/lib/tacker @@ -244,7 +244,6 @@ function configure_tacker { # allow tacker user to administer tacker to match tacker account sed -i 's/"context_is_admin": "role:admin"/"context_is_admin": "role:admin or user_name:tacker"/g' $TACKER_POLICY_FILE - iniset $TACKER_CONF DEFAULT verbose True iniset $TACKER_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL iniset $TACKER_CONF DEFAULT policy_file $TACKER_POLICY_FILE diff --git a/doc/source/install/manual_installation.rst b/doc/source/install/manual_installation.rst index d3f738a00..d3f89feaf 100644 --- a/doc/source/install/manual_installation.rst +++ b/doc/source/install/manual_installation.rst @@ -180,7 +180,6 @@ d). Provide an endpoint to tacker service. auth_strategy = keystone policy_file = /usr/local/etc/tacker/policy.json debug = True - verbose = True use_syslog = False state_path = /var/lib/tacker ... diff --git a/etc/tacker/tacker.conf b/etc/tacker/tacker.conf index b91d38e42..3b3da9476 100644 --- a/etc/tacker/tacker.conf +++ b/etc/tacker/tacker.conf @@ -1,7 +1,4 @@ [DEFAULT] -# Print more verbose output (set logging level to INFO instead of default WARNING level). -# verbose = False - # Print debugging output (set logging level to DEBUG instead of default WARNING level). # debug = False diff --git a/tacker/service.py b/tacker/service.py index 0602667ce..d5f77d6af 100644 --- a/tacker/service.py +++ b/tacker/service.py @@ -68,12 +68,7 @@ class TackerApiService(WsgiService): @classmethod def create(cls, app_name='tacker'): - # Setup logging early, supplying both the CLI options and the - # configuration mapping from the config file - # We only update the conf dict for the verbose and debug - # flags. Everything else must be set up in the conf file... - # Log the options used when starting if we're in debug mode... - + # Setup logging early config.setup_logging(cfg.CONF) # Dump the initial option values cfg.CONF.log_opt_values(LOG, std_logging.DEBUG) diff --git a/tacker/tests/etc/tacker.conf.test b/tacker/tests/etc/tacker.conf.test index fc18f289e..ec37f4a23 100644 --- a/tacker/tests/etc/tacker.conf.test +++ b/tacker/tests/etc/tacker.conf.test @@ -1,7 +1,4 @@ [DEFAULT] -# Show more verbose log output (sets INFO log level output) -verbose = True - # Show debugging output in logs (sets DEBUG log level output) debug = False