From 8019b5c190090af12f11c0e06eb4a4c26f3c5983 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Tue, 28 Nov 2017 10:14:05 -0800 Subject: [PATCH] Remove keystone_token_driver variable The memcache token driver was removed in Ocata and the only valid option is sql, which is only used when keystone_token_provider is uuid. Change-Id: I1db15e2553893b74d3f7d57d4d50ca2052be04e4 --- defaults/main.yml | 2 -- meta/main.yml | 4 ---- tasks/main.yml | 2 +- templates/keystone.conf.j2 | 9 --------- 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index a5a14dd1..63688829 100644 --- 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 index 056248eb..3521545e 100644 --- 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 index 07687336..a24462d0 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -92,7 +92,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 index 3e737db1..490617c7 100644 --- 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]