From c0690d7ea3588d839697a3ffb6b575c6f4952142 Mon Sep 17 00:00:00 2001
From: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
Date: Mon, 13 Apr 2015 17:19:04 +0000
Subject: keystone: Modify configuration files

Change-Id: Ibc5bcf819f1ac83362ea9642abe772dd94ebe4db
---
 .../usr/share/openstack/keystone/keystone.conf     | 27 +++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/openstack/usr/share/openstack/keystone/keystone.conf b/openstack/usr/share/openstack/keystone/keystone.conf
index c058a030..3d242a50 100644
--- a/openstack/usr/share/openstack/keystone/keystone.conf
+++ b/openstack/usr/share/openstack/keystone/keystone.conf
@@ -10,7 +10,7 @@
 # recommended), remove AdminTokenAuthMiddleware from your
 # paste application pipelines (for example, in keystone-
 # paste.ini). (string value)
-#admin_token=ADMIN
+admin_token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}
 
 # The IP address of the network interface for the public
 # service to listen on. (string value)
@@ -33,11 +33,11 @@
 
 # The port number which the admin service listens on. (integer
 # value)
-#admin_port=35357
+admin_port=35357
 
 # The port number which the public service listens on.
 # (integer value)
-#public_port=5000
+public_port=5000
 
 # The base public endpoint URL for Keystone that is advertised
 # to clients (NOTE: this does NOT affect how Keystone listens
@@ -207,23 +207,23 @@
 
 # The RabbitMQ broker address where a single node is used.
 # (string value)
-#rabbit_host=localhost
+rabbit_host={{ RABBITMQ_HOST }}
 
 # The RabbitMQ broker port where a single node is used.
 # (integer value)
-#rabbit_port=5672
+rabbit_port={{ RABBITMQ_PORT }}
 
 # RabbitMQ HA cluster host:port pairs. (list value)
-#rabbit_hosts=$rabbit_host:$rabbit_port
+rabbit_hosts=$rabbit_host:$rabbit_port
 
 # Connect over SSL for RabbitMQ. (boolean value)
-#rabbit_use_ssl=false
+rabbit_use_ssl=false
 
 # The RabbitMQ userid. (string value)
-#rabbit_userid=guest
+rabbit_userid={{ RABBITMQ_USER }}
 
 # The RabbitMQ password. (string value)
-#rabbit_password=guest
+rabbit_password={{ RABBITMQ_PASSWORD }}
 
 # the RabbitMQ login method (string value)
 #rabbit_login_method=AMQPLAIN
@@ -308,7 +308,7 @@
 
 # The messaging driver to use, defaults to rabbit. Other
 # drivers include qpid and zmq. (string value)
-#rpc_backend=rabbit
+rpc_backend=rabbit
 
 # The default exchange under which topics are scoped. May be
 # overridden by an exchange name specified in the
@@ -630,6 +630,7 @@
 # Deprecated group/name - [DATABASE]/sql_connection
 # Deprecated group/name - [sql]/connection
 #connection=<None>
+connection=postgresql://{{ KEYSTONE_DB_USER }}:{{ KEYSTONE_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/keystone
 
 # The SQLAlchemy connection string to use to connect to the
 # slave database. (string value)
@@ -1534,11 +1535,11 @@
 # Controls the token construction, validation, and revocation
 # operations. Core providers are
 # "keystone.token.providers.[pkiz|pki|uuid].Provider". The
-# default provider is uuid. (string value)
-#provider=<None>
+# default provider is pkiz. (string value)
+provider=keystone.token.providers.uuid.Provider
 
 # Token persistence backend driver. (string value)
-#driver=keystone.token.persistence.backends.sql.Token
+driver=keystone.token.backends.sql.Token
 
 # Toggle for token system caching. This has no effect unless
 # global caching is enabled. (boolean value)
-- 
cgit v1.2.1