From 76d39a6c2b1dea8bb07f837b44556c56973adb18 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
Date: Wed, 24 Oct 2018 15:47:13 +0200
Subject: [PATCH] Remove paste references in Keystone

Keystone paste file was recently removed, and the paste mechanism
was completely removed in the past [1].

This removes all references to it.

[1]: https://github.com/openstack/keystone/commit/d04bb1e7e61a39404b27ecf5248a0b7982863043

Change-Id: Idc137a255437ae316d2f99f957df7d62bc693bac
---
 defaults/main.yml               |  2 --
 tasks/keystone_post_install.yml | 18 +++---------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 82d241d5..4bfeb03e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -462,7 +462,6 @@ keystone_role_project_group: keystone_all
 # template engine and copied to the target host. If they do
 # not exist then the default files will be sourced from the
 # service git repository.
-keystone_paste_default_file_path: "/etc/openstack_deploy/keystone/keystone-paste.ini"
 keystone_policy_default_file_path: "/etc/openstack_deploy/keystone/policy.json"
 keystone_sso_callback_file_path: "/etc/openstack_deploy/keystone/sso_callback_template.html"
 
@@ -478,7 +477,6 @@ keystone_config_cache_path_owner: "{{ lookup('env', 'USER') | default('root', tr
 # The contents of these are templated over the default files.
 keystone_keystone_conf_overrides: {}
 keystone_keystone_default_conf_overrides: {}
-keystone_keystone_paste_ini_overrides: {}
 keystone_policy_overrides: {}
 
 keystone_required_secrets:
diff --git a/tasks/keystone_post_install.yml b/tasks/keystone_post_install.yml
index bb3ab064..fc47f4a8 100644
--- a/tasks/keystone_post_install.yml
+++ b/tasks/keystone_post_install.yml
@@ -39,7 +39,6 @@
   stat:
     path: "{{ item }}"
   with_items:
-    - "{{ keystone_paste_default_file_path }}"
     - "{{ keystone_policy_default_file_path }}"
     - "{{ keystone_sso_callback_file_path }}"
   register: _user_provided_config_files
@@ -55,14 +54,10 @@
 
 - name: Retrieve default configuration files from venv
   fetch:
-    src: "{{ _keystone_etc }}/keystone/{{ item }}"
+    src: "{{ _keystone_etc }}/keystone/{{ keystone_sso_callback_file_path | basename }}"
     dest: "{{ keystone_config_cache_path }}/"
     flat: yes
-  with_items:
-    - "{{ keystone_paste_default_file_path | basename }}"
-    - "{{ keystone_sso_callback_file_path | basename }}"
   run_once: yes
-  register: _venv_config_file_fetch
 
 - name: Copy keystone configuration files
   config_template:
@@ -81,19 +76,12 @@
       dest: "/etc/keystone/keystone.conf"
       config_overrides: "{{ keystone_keystone_conf_overrides }}"
       config_type: "ini"
-    - src: >-
-        {{ (_user_provided_config_files['results'][0]['stat']['exists'] | bool) |
-           ternary(keystone_paste_default_file_path,
-           keystone_config_cache_path ~ '/' ~ keystone_paste_default_file_path | basename) }}
-      dest: "/etc/keystone/keystone-paste.ini"
-      config_overrides: "{{ keystone_keystone_paste_ini_overrides }}"
-      config_type: "ini"
     - src: "{{ keystone_policy_default_file_path }}"
       dest: "/etc/keystone/policy.json-{{ keystone_venv_tag }}"
       config_overrides: "{{ keystone_policy_overrides }}"
       config_type: "json"
       condition: >-
-        {{ _user_provided_config_files['results'][1]['stat']['exists'] | bool }}
+        {{ _user_provided_config_files['results'][0]['stat']['exists'] | bool }}
   notify:
     - Manage LB
     - Restart uWSGI
@@ -102,7 +90,7 @@
 - name: Copy Keystone Federation SP SSO callback template
   copy:
     src: >-
-        {{ (_user_provided_config_files['results'][2]['stat']['exists'] | bool) |
+        {{ (_user_provided_config_files['results'][1]['stat']['exists'] | bool) |
            ternary(keystone_sso_callback_file_path,
            keystone_config_cache_path ~ '/' ~ keystone_sso_callback_file_path | basename) }}
     dest: "/etc/keystone/sso_callback_template.html"