diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-26 18:02:25 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-04-08 15:46:36 +0000 |
commit | b1e5a277e83271a1a7d75015eafcb77b0645c3ab (patch) | |
tree | 5a28d9c948e966439b387a51b386d5af93eaa955 | |
parent | d4a598b9fd037539144ca58a764132c172799b9a (diff) | |
download | definitions-b1e5a277e83271a1a7d75015eafcb77b0645c3ab.tar.gz |
keystone: Move templates to /usr/share/openstack/keystone
Also change placeholders to jinja2 type
-rw-r--r-- | openstack/usr/share/openstack/keystone/keystone-paste.ini (renamed from openstack/etc/keystone/keystone-paste.ini) | 0 | ||||
-rw-r--r-- | openstack/usr/share/openstack/keystone/keystone.conf (renamed from openstack/etc/keystone/keystone.conf) | 18 | ||||
-rw-r--r-- | openstack/usr/share/openstack/keystone/logging.conf (renamed from openstack/etc/keystone/logging.conf) | 0 | ||||
-rw-r--r-- | openstack/usr/share/openstack/keystone/policy.json (renamed from openstack/etc/keystone/policy.json) | 0 |
4 files changed, 9 insertions, 9 deletions
diff --git a/openstack/etc/keystone/keystone-paste.ini b/openstack/usr/share/openstack/keystone/keystone-paste.ini index cd132971..cd132971 100644 --- a/openstack/etc/keystone/keystone-paste.ini +++ b/openstack/usr/share/openstack/keystone/keystone-paste.ini diff --git a/openstack/etc/keystone/keystone.conf b/openstack/usr/share/openstack/keystone/keystone.conf index a46cc5fc..154a6a18 100644 --- a/openstack/etc/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=##KEYSTONE_TEMPORARY_ADMIN_TOKEN## +admin_token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }} # The IP address of the network interface for the public # service to listen on. (string value) @@ -200,11 +200,11 @@ public_port=5000 # The RabbitMQ broker address where a single node is used. # (string value) -rabbit_host=##RABBITMQ_HOST## +rabbit_host={{ RABBITMQ_HOST }} # The RabbitMQ broker port where a single node is used. # (integer value) -rabbit_port=##RABBITMQ_PORT## +rabbit_port={{ RABBITMQ_PORT }} # RabbitMQ HA cluster host:port pairs. (list value) rabbit_hosts=$rabbit_host:$rabbit_port @@ -213,10 +213,10 @@ rabbit_hosts=$rabbit_host:$rabbit_port rabbit_use_ssl=false # The RabbitMQ userid. (string value) -rabbit_userid=##RABBITMQ_USER## +rabbit_userid={{ RABBITMQ_USER }} # The RabbitMQ password. (string value) -rabbit_password=##RABBITMQ_PASSWORD## +rabbit_password={{ RABBITMQ_PASSWORD }} # the RabbitMQ login method (string value) #rabbit_login_method=AMQPLAIN @@ -628,7 +628,7 @@ rpc_backend=rabbit # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection #connection=<None> -connection=postgresql://##KEYSTONE_DB_USER##:##KEYSTONE_DB_PASSWORD##@onenode/keystone +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) @@ -1207,7 +1207,7 @@ connection=postgresql://##KEYSTONE_DB_USER##:##KEYSTONE_DB_PASSWORD##@onenode/ke # An implementation of the backend for persisting revocation # events. (string value) -#driver=keystone.contrib.revoke.backends.kvs.Revoke +driver=keystone.contrib.revoke.backends.sql.Revoke # This value (calculated in seconds) is added to token # expiration before a revocation event may be removed from the @@ -1332,10 +1332,10 @@ connection=postgresql://##KEYSTONE_DB_USER##:##KEYSTONE_DB_PASSWORD##@onenode/ke # operations. Core providers are # "keystone.token.providers.[pkiz|pki|uuid].Provider". The # default provider is pkiz. (string value) -#provider=<None> +provider=keystone.token.providers.uuid.Provider # Token persistence backend driver. (string value) -#driver=keystone.token.backends.sql.Token +driver=keystone.token.backends.sql.Token # Toggle for token system cacheing. This has no effect unless # global caching is enabled. (boolean value) diff --git a/openstack/etc/keystone/logging.conf b/openstack/usr/share/openstack/keystone/logging.conf index 21d43c8d..21d43c8d 100644 --- a/openstack/etc/keystone/logging.conf +++ b/openstack/usr/share/openstack/keystone/logging.conf diff --git a/openstack/etc/keystone/policy.json b/openstack/usr/share/openstack/keystone/policy.json index 9c7e646e..9c7e646e 100644 --- a/openstack/etc/keystone/policy.json +++ b/openstack/usr/share/openstack/keystone/policy.json |