From 0bbacf63ba98e56616c351e218f6b59e55c849ac Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Mon, 26 Sep 2016 19:52:25 +0100 Subject: [PATCH] Revert dynamic includes for inventory-based conditionals Forcing dynamic includes for inventory-based conditionals results in incomplete execution. Change-Id: I8e8e2b386951ab99ae8fbac6ca348c51dfcda91d --- tasks/keystone_credential.yml | 1 - tasks/keystone_fernet.yml | 2 -- tasks/keystone_idp_setup.yml | 3 --- tasks/keystone_ssl_self_signed.yml | 3 --- tasks/main.yml | 3 --- 5 files changed, 12 deletions(-) diff --git a/tasks/keystone_credential.yml b/tasks/keystone_credential.yml index 3f1c33c1..103d7e5b 100644 --- a/tasks/keystone_credential.yml +++ b/tasks/keystone_credential.yml @@ -14,7 +14,6 @@ # limitations under the License. - include: keystone_credential_create.yml - static: no when: inventory_hostname == groups['keystone_all'][0] - include: keystone_credential_distribute.yml diff --git a/tasks/keystone_fernet.yml b/tasks/keystone_fernet.yml index ed2ecbca..38801da0 100644 --- a/tasks/keystone_fernet.yml +++ b/tasks/keystone_fernet.yml @@ -14,11 +14,9 @@ # limitations under the License. - include: keystone_fernet_keys_create.yml - static: no when: inventory_hostname == groups['keystone_all'][0] - include: keystone_fernet_keys_distribute.yml - static: no when: inventory_hostname == groups['keystone_all'][0] - include: keystone_fernet_keys_autorotate.yml diff --git a/tasks/keystone_idp_setup.yml b/tasks/keystone_idp_setup.yml index d0486e52..8fdc3ee3 100644 --- a/tasks/keystone_idp_setup.yml +++ b/tasks/keystone_idp_setup.yml @@ -14,15 +14,12 @@ # limitations under the License. - include: keystone_idp_self_signed_create.yml - static: no when: inventory_hostname == groups['keystone_all'][0] - include: keystone_idp_self_signed_store.yml - static: no when: inventory_hostname == groups['keystone_all'][0] - include: keystone_idp_self_signed_distribute.yml - static: no when: inventory_hostname != groups['keystone_all'][0] - include: keystone_idp_metadata.yml diff --git a/tasks/keystone_ssl_self_signed.yml b/tasks/keystone_ssl_self_signed.yml index 12b621cb..906b00e2 100644 --- a/tasks/keystone_ssl_self_signed.yml +++ b/tasks/keystone_ssl_self_signed.yml @@ -14,13 +14,10 @@ # limitations under the License. - include: keystone_ssl_key_create.yml - static: no when: inventory_hostname == groups['keystone_all'][0] - include: keystone_ssl_key_store.yml - static: no when: inventory_hostname == groups['keystone_all'][0] - include: keystone_ssl_key_distribute.yml - static: no when: inventory_hostname != groups['keystone_all'][0] diff --git a/tasks/main.yml b/tasks/main.yml index ca95869d..3ae4263a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -94,7 +94,6 @@ - keystone-config - include: keystone_db_setup.yml - static: no when: - keystone_database_enabled | bool - inventory_hostname == groups['keystone_all'][0] @@ -138,7 +137,6 @@ meta: flush_handlers - include: keystone_service_setup.yml - static: no when: - keystone_service_setup | bool - inventory_hostname == groups['keystone_all'][0] @@ -154,7 +152,6 @@ - keystone-config - include: keystone_federation_sp_idp_setup.yml - static: no when: - keystone_service_setup | bool - keystone_sp != {}