From cb1d7e655854c858f5ce1a7c99d105c2a8fee0fa Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 28 May 2015 09:54:26 +0000 Subject: Keystone: Add back custom configuration for keystone.conf This should almost match the changes done for keystone.conf in the commit 8d76e18a6debb4b421c5d443bc673f88abc7a8e6, but for Kilo 2015.1.0 --- .../usr/share/openstack/keystone/keystone.conf | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/install-files/openstack/usr/share/openstack/keystone/keystone.conf b/install-files/openstack/usr/share/openstack/keystone/keystone.conf index 1c2298bf..1a082601 100644 --- a/install-files/openstack/usr/share/openstack/keystone/keystone.conf +++ b/install-files/openstack/usr/share/openstack/keystone/keystone.conf @@ -9,7 +9,7 @@ # production (highly 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 }} # (Deprecated) The port which the OpenStack Compute service listens on. This # option was only used for string replacement in the templated catalog backend. @@ -249,7 +249,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 transport_url option. (string value) @@ -415,7 +415,7 @@ # Deprecated group/name - [DEFAULT]/sql_connection # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection -#connection = +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) @@ -557,7 +557,7 @@ # The port number which the public service listens on. (integer value) # Deprecated group/name - [DEFAULT]/public_port -#public_port = 5000 +public_port = 5000 # The IP address of the network interface for the admin service to listen on. # (string value) @@ -567,7 +567,7 @@ # The port number which the admin service listens on. (integer value) # Deprecated group/name - [DEFAULT]/admin_port -#admin_port = 35357 +admin_port = 35357 # Set this to true if you want to enable TCP_KEEPALIVE on server sockets, i.e. # sockets used by the Keystone wsgi server for client connections. (boolean @@ -1337,27 +1337,27 @@ # The RabbitMQ broker address where a single node is used. (string value) # Deprecated group/name - [DEFAULT]/rabbit_host -#rabbit_host = localhost +rabbit_host = {{ RABBITMQ_HOST }} # The RabbitMQ broker port where a single node is used. (integer value) # Deprecated group/name - [DEFAULT]/rabbit_port -#rabbit_port = 5672 +rabbit_port = {{ RABBITMQ_PORT }} # RabbitMQ HA cluster host:port pairs. (list value) # Deprecated group/name - [DEFAULT]/rabbit_hosts -#rabbit_hosts = $rabbit_host:$rabbit_port +rabbit_hosts = $rabbit_host:$rabbit_port # Connect over SSL for RabbitMQ. (boolean value) # Deprecated group/name - [DEFAULT]/rabbit_use_ssl -#rabbit_use_ssl = false +rabbit_use_ssl = false # The RabbitMQ userid. (string value) # Deprecated group/name - [DEFAULT]/rabbit_userid -#rabbit_userid = guest +rabbit_userid = {{ RABBITMQ_USER }} # The RabbitMQ password. (string value) # Deprecated group/name - [DEFAULT]/rabbit_password -#rabbit_password = guest +rabbit_password = {{ RABBITMQ_PASSWORD }} # The RabbitMQ login method. (string value) # Deprecated group/name - [DEFAULT]/rabbit_login_method @@ -1681,10 +1681,10 @@ # Controls the token construction, validation, and revocation operations. Core # providers are "keystone.token.providers.[fernet|pkiz|pki|uuid].Provider". # (string value) -#provider = keystone.token.providers.uuid.Provider +provider = keystone.token.providers.uuid.Provider # Token persistence backend driver. (string value) -#driver = keystone.token.persistence.backends.sql.Token +driver = keystone.token.persistence.backends.sql.Token # Toggle for token system caching. This has no effect unless global caching is # enabled. (boolean value) -- cgit v1.2.1