From be2efe9f8f3a5f4e0b7c8d314e6e27c49ed632fe Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Mon, 21 Feb 2022 17:05:31 +0000
Subject: [PATCH] Tidy IDP setup task files

Remove task files with just a single task and move the tasks up
one layer.

Change-Id: Iffdc333170987aa49d267ee749542c875a262d97
---
 tasks/keystone_idp_metadata.yml | 24 ------------------------
 tasks/keystone_idp_setup.yml    | 27 +++++++++++++++++++++++++--
 tasks/keystone_idp_sp_setup.yml | 31 -------------------------------
 3 files changed, 25 insertions(+), 57 deletions(-)
 delete mode 100644 tasks/keystone_idp_metadata.yml
 delete mode 100644 tasks/keystone_idp_sp_setup.yml

diff --git a/tasks/keystone_idp_metadata.yml b/tasks/keystone_idp_metadata.yml
deleted file mode 100644
index b76d090d..00000000
--- a/tasks/keystone_idp_metadata.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Generate IdP metadata
-  shell: |
-    {{ keystone_bin }}/keystone-manage saml_idp_metadata > {{ keystone_idp.idp_metadata_path }}
-  become: yes
-  become_user: "{{ keystone_system_user_name }}"
-  when: keystone_idp != {}
-  notify:
-    - Manage LB
-    - Restart uWSGI
diff --git a/tasks/keystone_idp_setup.yml b/tasks/keystone_idp_setup.yml
index 3fd1badc..0f0763b9 100644
--- a/tasks/keystone_idp_setup.yml
+++ b/tasks/keystone_idp_setup.yml
@@ -13,7 +13,30 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include_tasks: keystone_idp_metadata.yml
+- name: Generate IdP metadata
+  shell: |
+    {{ keystone_bin }}/keystone-manage saml_idp_metadata > {{ keystone_idp.idp_metadata_path }}
+  become: yes
+  become_user: "{{ keystone_system_user_name }}"
+  when: keystone_idp != {}
+  notify:
+    - Manage LB
+    - Restart uWSGI
 
-- include_tasks: keystone_idp_sp_setup.yml
+- name: Register service providers
+  openstack.osa.keystone:
+    command: "ensure_service_provider"
+    login_user: "{{ keystone_admin_user_name }}"
+    login_password: "{{ keystone_auth_admin_password }}"
+    login_project_name: "{{ keystone_admin_tenant_name }}"
+    endpoint: "{{ keystone_service_adminurl }}"
+    sp_name: "{{ item.id }}"
+    sp_url: "{{ item.sp_url }}"
+    sp_auth_url: "{{ item.auth_url }}"
+  with_items: "{{ keystone_idp.service_providers | default([]) }}"
+  no_log: true
+  register: add_service_providers
+  until: add_service_providers is success
+  retries: 5
+  delay: 10
   when: keystone_service_setup | bool
diff --git a/tasks/keystone_idp_sp_setup.yml b/tasks/keystone_idp_sp_setup.yml
deleted file mode 100644
index 7c216cbe..00000000
--- a/tasks/keystone_idp_sp_setup.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Register service providers
-  openstack.osa.keystone:
-    command: "ensure_service_provider"
-    login_user: "{{ keystone_admin_user_name }}"
-    login_password: "{{ keystone_auth_admin_password }}"
-    login_project_name: "{{ keystone_admin_tenant_name }}"
-    endpoint: "{{ keystone_service_adminurl }}"
-    sp_name: "{{ item.id }}"
-    sp_url: "{{ item.sp_url }}"
-    sp_auth_url: "{{ item.auth_url }}"
-  with_items: "{{ keystone_idp.service_providers | default([]) }}"
-  no_log: true
-  register: add_service_providers
-  until: add_service_providers is success
-  retries: 5
-  delay: 10