Merge "Remove keystone_token_driver variable"

openstack · Dec 4, 2017 · ac278ff · ac278ff
2 parents 3e4fe9d + 8019b5c
commit ac278ff
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 16 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -57,8 +57,6 @@ keystone_system_user_home: "/var/lib/{{ keystone_system_user_name }}"
 ## Drivers
 keystone_auth_methods: "password,token"
 keystone_identity_driver: sql
-# For a sql backed token storage use: "sql"
-keystone_token_driver: memcache
 keystone_token_provider: fernet
 keystone_token_expiration: 43200
 keystone_token_cache_time: 3600

diff --git a/meta/main.yml b/meta/main.yml
@@ -45,7 +45,3 @@ dependencies:
   - role: galera_client
     when:
       - keystone_database_enabled | bool
-  - role: memcached_server
-    when:
-      - "'memcache' in keystone_token_driver"
-      - "'fernet' not in keystone_token_provider"
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -85,7 +85,7 @@
 - include: keystone_token_cleanup.yml
   static: no
   when:
-    - "'sql' in keystone_token_driver"
+    - "'uuid' in keystone_token_provider"
   run_once: yes
   tags:
     - keystone-install

diff --git a/templates/keystone.conf.j2 b/templates/keystone.conf.j2
@@ -32,12 +32,6 @@ driver = messagingv2
 transport_url = rabbit://{% for host in keystone_rabbitmq_telemetry_servers.split(',') %}{{ keystone_rabbitmq_telemetry_userid }}:{{ keystone_rabbitmq_telemetry_password }}@{{ host }}:{{ keystone_rabbitmq_telemetry_port }}{% if not loop.last %},{% else %}/{{ keystone_rabbitmq_telemetry_vhost }}{% endif %}{% endfor %}
 {% endif %}
 
-{% if 'memcache' in keystone_token_driver and 'fernet' not in keystone_token_provider %}
-[memcache]
-servers = {{ keystone_memcached_servers }}
-max_compare_and_set_retry = {{ keystone_memcached_max_compare_and_set_retry }}
-{% endif %}
-
 {% if keystone_cache_backend_argument is defined %}
 [cache]
 backend = dogpile.cache.memcached
@@ -106,9 +100,6 @@ expiration = {{ keystone_token_expiration }}
 caching = true
 cache_time = {{ keystone_token_cache_time }}
 provider = {{ keystone_token_provider }}
-{% if 'fernet' not in keystone_token_provider %}
-driver = {{ keystone_token_driver }}
-{% endif %}
 
 {% if keystone_idp != {} %}
 [saml]