diff --git a/devstack/lib/magnum b/devstack/lib/magnum index 700a0a1d16..f9767434a3 100644 --- a/devstack/lib/magnum +++ b/devstack/lib/magnum @@ -123,7 +123,6 @@ function create_magnum_conf { # (Re)create ``magnum.conf`` rm -f $MAGNUM_CONF - iniset $MAGNUM_CONF DEFAULT verbose "True" iniset $MAGNUM_CONF DEFAULT debug "$ENABLE_DEBUG_LOG_LEVEL" iniset $MAGNUM_CONF oslo_messaging_rabbit rabbit_userid $RABBIT_USERID iniset $MAGNUM_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD diff --git a/doc/source/dev/dev-manual-devstack.rst b/doc/source/dev/dev-manual-devstack.rst index ecd99224bf..f79dbd4fe3 100644 --- a/doc/source/dev/dev-manual-devstack.rst +++ b/doc/source/dev/dev-manual-devstack.rst @@ -169,9 +169,6 @@ Configure magnum:: # enable debugging output sudo sed -i "s/#debug\s*=.*/debug=true/" /etc/magnum/magnum.conf - # enable more verbose output - sudo sed -i "s/#verbose\s*=.*/verbose=true/" /etc/magnum/magnum.conf - # set RabbitMQ userid sudo sed -i "s/#rabbit_userid\s*=.*/rabbit_userid=stackrabbit/" \ /etc/magnum/magnum.conf diff --git a/etc/magnum/magnum.conf.sample b/etc/magnum/magnum.conf.sample index c65f0e7742..c41be676fd 100644 --- a/etc/magnum/magnum.conf.sample +++ b/etc/magnum/magnum.conf.sample @@ -43,9 +43,11 @@ # default WARNING level). (boolean value) #debug = false -# Print more verbose output (set logging level to INFO instead of -# default WARNING level). (boolean value) -#verbose = false +# If set to false, will disable INFO logging level, making WARNING the +# default. (boolean value) +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +#verbose = true # The name of a logging configuration file. This file is appended to # any existing logging configuration files. For details about logging diff --git a/magnum/tests/conf_fixture.py b/magnum/tests/conf_fixture.py index dbb4099db2..9227d6a026 100644 --- a/magnum/tests/conf_fixture.py +++ b/magnum/tests/conf_fixture.py @@ -34,6 +34,5 @@ class ConfFixture(fixtures.Fixture): self.conf.set_default('host', 'fake-mini') self.conf.set_default('connection', "sqlite://", group='database') self.conf.set_default('sqlite_synchronous', False, group='database') - self.conf.set_default('verbose', True) config.parse_args([], default_config_files=[]) self.addCleanup(self.conf.reset)