master only support newton

JIRA: COMPASS-513

Remove other roles and ppa, master only support newton.

Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00
Signed-off-by: liyuenan <liyuenan@huawei.com>

1 files changed, 26 insertions, 25 deletions

diff --git a/deploy/adapters/ansible/roles/keystone/templates/keystone.conf b/deploy/adapters/ansible/roles/keystone/templates/keystone.conf
index 649fc32c..919be344 100644
--- a/deploy/adapters/ansible/roles/keystone/templates/keystone.conf
+++ b/deploy/adapters/ansible/roles/keystone/templates/keystone.conf
@@ -7,51 +7,52 @@
 {% set memcached_servers = memcached_servers|join(',') %}
 {% set rabbitmq_servers = rabbitmq_servers|join(',') %}
 [DEFAULT]
-admin_token={{ ADMIN_TOKEN }}
 debug={{ DEBUG }}
 log_dir = /var/log/keystone
 
 [cache]
-backend=keystone.cache.memcache_pool
-memcache_servers={{ memcached_servers}}
+backend = keystone.cache.memcache_pool
+memcache_servers = {{ memcached_servers}}
 enabled=true
 
 [revoke]
-driver=sql
-expiration_buffer=3600
-caching=true
+driver = sql
+expiration_buffer = 3600
+caching = true
 
 [database]
 connection = mysql://keystone:{{ KEYSTONE_DBPASS }}@{{ db_host }}/keystone?charset=utf8
-idle_timeout=30
-min_pool_size=5
-max_pool_size=120
-pool_timeout=30
+idle_timeout = 30
+min_pool_size = 5
+max_pool_size = 120
+pool_timeout = 30
 
+[fernet_tokens]
+key_repository = /etc/keystone/fernet-keys/
 
 [identity]
-default_domain_id=default
-driver=sql
+default_domain_id = default
+driver = sql
 
 [assignment]
-driver=sql
+driver = sql
 
 [resource]
-driver=sql
-caching=true
-cache_time=3600
-     
+driver = sql
+caching = true
+cache_time = 3600
+
 [token]
-enforce_token_bind=permissive
-expiration=43200
-provider=uuid
-driver=sql
-caching=true
-cache_time=3600
+enforce_token_bind = permissive
+expiration = 43200
+provider = fernet
+driver = sql
+caching = true
+cache_time = 3600
 
 [eventlet_server]
-public_bind_host= {{ identity_host }}
-admin_bind_host= {{ identity_host }}
+public_bind_host = {{ identity_host }}
+admin_bind_host = {{ identity_host }}
 
 [oslo_messaging_rabbit]
 rabbit_userid = {{ RABBIT_USER }}