Merge "Switch to new Juno defaults"

redhat-openstack · Oct 20, 2014 · 77d066c · 77d066c
2 parents 1459063 + 7ddfea2
commit 77d066c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -30,7 +30,7 @@
 #     Defaults to 'keystone.token.providers.uuid.Provider'
 #     Supports PKI and UUID.
 #   [token_driver] Driver to use for managing tokens.
-#     Optional.  Defaults to 'keystone.token.backends.sql.Token'
+#     Optional.  Defaults to 'keystone.token.persistence.backends.sql.Token'
 #   [token_expiration] Amount of time a token should remain valid (seconds).
 #     Optional.  Defaults to 3600 (1 hour).
 #   [token_format] Deprecated: Use token_provider instead.
@@ -269,7 +269,7 @@
   $catalog_template_file = '/etc/keystone/default_catalog.templates',
   $token_format          = false,
   $token_provider        = 'keystone.token.providers.uuid.Provider',
-  $token_driver          = 'keystone.token.backends.sql.Token',
+  $token_driver          = 'keystone.token.persistence.backends.sql.Token',
   $token_expiration      = 3600,
   $public_endpoint       = false,
   $admin_endpoint        = false,

diff --git a/manifests/logging.pp b/manifests/logging.pp
@@ -35,10 +35,13 @@
 #    (optional) Hash of logger (keys) and level (values) pairs.
 #    Defaults to undef.
 #    Example:
-#      { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
-#        'qpid' => 'WARN', 'sqlalchemy' => 'WARN', 'suds' => 'INFO',
-#        'iso8601' => 'WARN',
-#        'requests.packages.urllib3.connectionpool' => 'WARN' }
+#      { 'amqp'  => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
+#           'qpid' => 'WARN', 'sqlalchemy' => 'WARN', 'suds' => 'INFO',
+#           'oslo.messaging' => 'INFO', 'iso8601' => 'WARN',
+#           'requests.packages.urllib3.connectionpool' => 'WARN',
+#           'urllib3.connectionpool' => 'WARN',
+#           'websocket' => 'WARN', 'keystonemiddleware' => 'WARN',
+#           'routes.middleware' => 'WARN', stevedore => 'WARN' }
 #
 #  [*publish_errors*]
 #    (optional) Publish error events (boolean value).

diff --git a/spec/classes/keystone_spec.rb b/spec/classes/keystone_spec.rb
@@ -32,7 +32,7 @@
       'catalog_type'          => 'sql',
       'catalog_driver'        => false,
       'token_provider'        => 'keystone.token.providers.uuid.Provider',
-      'token_driver'          => 'keystone.token.backends.sql.Token',
+      'token_driver'          => 'keystone.token.persistence.backends.sql.Token',
       'cache_dir'             => '/var/cache/keystone',
       'enable_ssl'            => false,
       'ssl_certfile'          => '/etc/keystone/ssl/certs/keystone.pem',