Blob Blame History Raw
From f61d5894a370a6bff83f9a47eefcd5e8af4274de Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec@redhat.com>
Date: Fri, 21 Mar 2014 00:19:58 +0100
Subject: [PATCH] change default configuration

instead of using openstack-config in spec,
change defaults in a patch to avoid crudini issue

Resolves: rhbz#1057621
---
 etc/keystone.conf.sample | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
index 9e66eb6..ae486fd 100644
--- a/etc/keystone.conf.sample
+++ b/etc/keystone.conf.sample
@@ -44,6 +44,7 @@
 
 # Name of log file to output to. If not set, logging will go to stdout.
 # log_file = keystone.log
+log_file = /var/log/keystone/keystone.log
 
 # The directory to keep log files in (will be prepended to --logfile)
 # log_dir = /var/log/keystone
@@ -72,16 +73,19 @@
 # onready = systemd-notify --ready
 # or a module with notify() method:
 # onready = keystone.common.systemd
+onready = keystone.common.systemd
 
 [sql]
 # The SQLAlchemy connection string used to connect to the database
 # connection = sqlite:///keystone.db
+connection = mysql://keystone:keystone@localhost/keystone
 
 # the timeout before idle sql connections are reaped
 # idle_timeout = 200
 
 [identity]
 # driver = keystone.identity.backends.sql.Identity
+driver = keystone.identity.backends.sql.Identity
 
 # This references the domain to use for all Identity API v2 requests (which are
 # not aware of domains). A domain with this ID will be created for you by
@@ -100,14 +104,17 @@
 [catalog]
 # dynamic, sql-based backend (supports API/CLI-based management commands)
 # driver = keystone.catalog.backends.sql.Catalog
+driver = keystone.catalog.backends.sql.Catalog
 
 # static, file-based backend (does *NOT* support any management commands)
 # driver = keystone.catalog.backends.templated.TemplatedCatalog
 
 # template_file = default_catalog.templates
+template_file = /etc/keystone/default_catalog.templates
 
 [token]
 # driver = keystone.token.backends.kvs.Token
+driver = keystone.token.backends.sql.Token
 
 # Amount of time a token should remain valid (in seconds)
 # expiration = 86400
@@ -117,6 +124,7 @@
 
 [ec2]
 # driver = keystone.contrib.ec2.backends.kvs.Ec2
+driver = keystone.contrib.ec2.backends.sql.Ec2
 
 [ssl]
 #enable = True