diff --git a/meta/main.yml b/meta/main.yml index ee21cf5b..47a3756e 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -18,7 +18,7 @@ galaxy_info: description: Installation and setup of keystone company: Rackspace license: Apache2 - min_ansible_version: 2.2 + min_ansible_version: 2.4 platforms: - name: Ubuntu versions: diff --git a/tasks/keystone_credential.yml b/tasks/keystone_credential.yml index 103d7e5b..bb1abc9f 100644 --- a/tasks/keystone_credential.yml +++ b/tasks/keystone_credential.yml @@ -13,10 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: keystone_credential_create.yml +- include_tasks: keystone_credential_create.yml when: inventory_hostname == groups['keystone_all'][0] -- include: keystone_credential_distribute.yml +- include_tasks: keystone_credential_distribute.yml when: inventory_hostname == groups['keystone_all'][0] -- include: keystone_credential_autorotate.yml +- include_tasks: keystone_credential_autorotate.yml diff --git a/tasks/keystone_fernet.yml b/tasks/keystone_fernet.yml index 38801da0..613f3b3e 100644 --- a/tasks/keystone_fernet.yml +++ b/tasks/keystone_fernet.yml @@ -13,10 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: keystone_fernet_keys_create.yml +- include_tasks: keystone_fernet_keys_create.yml when: inventory_hostname == groups['keystone_all'][0] -- include: keystone_fernet_keys_distribute.yml +- include_tasks: keystone_fernet_keys_distribute.yml when: inventory_hostname == groups['keystone_all'][0] -- include: keystone_fernet_keys_autorotate.yml +- include_tasks: keystone_fernet_keys_autorotate.yml diff --git a/tasks/keystone_idp_setup.yml b/tasks/keystone_idp_setup.yml index 8fdc3ee3..6782fb64 100644 --- a/tasks/keystone_idp_setup.yml +++ b/tasks/keystone_idp_setup.yml @@ -13,17 +13,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: keystone_idp_self_signed_create.yml +- include_tasks: keystone_idp_self_signed_create.yml when: inventory_hostname == groups['keystone_all'][0] -- include: keystone_idp_self_signed_store.yml +- include_tasks: keystone_idp_self_signed_store.yml when: inventory_hostname == groups['keystone_all'][0] -- include: keystone_idp_self_signed_distribute.yml +- include_tasks: keystone_idp_self_signed_distribute.yml when: inventory_hostname != groups['keystone_all'][0] -- include: keystone_idp_metadata.yml +- include_tasks: keystone_idp_metadata.yml -- include: keystone_idp_sp_setup.yml - static: no +- include_tasks: keystone_idp_sp_setup.yml when: keystone_service_setup | bool diff --git a/tasks/keystone_key_setup.yml b/tasks/keystone_key_setup.yml index eeb0bd5f..3824de25 100644 --- a/tasks/keystone_key_setup.yml +++ b/tasks/keystone_key_setup.yml @@ -13,6 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: keystone_key_populate.yml +- include_tasks: keystone_key_populate.yml -- include: keystone_key_distribute.yml +- include_tasks: keystone_key_distribute.yml diff --git a/tasks/keystone_ssl.yml b/tasks/keystone_ssl.yml index 4f0cb1df..3df4128d 100644 --- a/tasks/keystone_ssl.yml +++ b/tasks/keystone_ssl.yml @@ -13,10 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: keystone_ssl_self_signed.yml - static: no +- include_tasks: keystone_ssl_self_signed.yml when: - keystone_ssl | bool - keystone_user_ssl_cert is not defined or keystone_user_ssl_key is not defined -- include: keystone_ssl_user_provided.yml +- include_tasks: keystone_ssl_user_provided.yml diff --git a/tasks/keystone_ssl_self_signed.yml b/tasks/keystone_ssl_self_signed.yml index 906b00e2..1cfe3a15 100644 --- a/tasks/keystone_ssl_self_signed.yml +++ b/tasks/keystone_ssl_self_signed.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: keystone_ssl_key_create.yml +- include_tasks: keystone_ssl_key_create.yml when: inventory_hostname == groups['keystone_all'][0] -- include: keystone_ssl_key_store.yml +- include_tasks: keystone_ssl_key_store.yml when: inventory_hostname == groups['keystone_all'][0] -- include: keystone_ssl_key_distribute.yml +- include_tasks: keystone_ssl_key_distribute.yml when: inventory_hostname != groups['keystone_all'][0] diff --git a/tasks/keystone_uwsgi.yml b/tasks/keystone_uwsgi.yml index 002d2a34..e961d9a1 100644 --- a/tasks/keystone_uwsgi.yml +++ b/tasks/keystone_uwsgi.yml @@ -30,4 +30,4 @@ - Manage LB - Restart uWSGI -- include: "keystone_init_{{ ansible_service_mgr }}.yml" +- include_tasks: "keystone_init_{{ ansible_service_mgr }}.yml" diff --git a/tasks/main.yml b/tasks/main.yml index 4b5e30dd..c021be4a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -47,11 +47,11 @@ tags: - always -- include: keystone_pre_install.yml +- include_tasks: keystone_pre_install.yml tags: - keystone-install -- include: keystone_install.yml +- include_tasks: keystone_install.yml tags: - keystone-install @@ -62,77 +62,72 @@ tags: - keystone-config -- include: keystone_post_install.yml +- include_tasks: keystone_post_install.yml tags: - keystone-config -- include: keystone_key_setup.yml +- include_tasks: keystone_key_setup.yml tags: - keystone-config -- include: keystone_fernet.yml - static: no +- include_tasks: keystone_fernet.yml when: - "'fernet' in keystone_token_provider" - keystone_service_setup | bool tags: - keystone-config -- include: keystone_credential.yml - static: no +- include_tasks: keystone_credential.yml when: keystone_service_setup | bool tags: - keystone-config -- include: keystone_federation_sp_setup.yml - static: no +- include_tasks: keystone_federation_sp_setup.yml when: keystone_sp != {} tags: - keystone-config -- include: keystone_db_setup.yml +- include_tasks: keystone_db_setup.yml when: - "keystone_database_enabled | bool" tags: - keystone-config -- include: keystone_token_cleanup.yml - static: no +- include_tasks: keystone_token_cleanup.yml when: - "'uuid' in keystone_token_provider" run_once: yes tags: - keystone-install -- include: keystone_ssl.yml +- include_tasks: keystone_ssl.yml tags: - keystone-config -- include: "keystone_{{ keystone_web_server }}.yml" +- include_tasks: "keystone_{{ keystone_web_server }}.yml" tags: - keystone-config -- include: keystone_uwsgi.yml +- include_tasks: keystone_uwsgi.yml tags: - keystone-config - name: Flush handlers meta: flush_handlers -- include: keystone_service_setup.yml +- include_tasks: keystone_service_setup.yml when: - keystone_service_setup | bool run_once: yes tags: - keystone-config -- include: keystone_ldap_setup.yml - static: no +- include_tasks: keystone_ldap_setup.yml when: keystone_service_setup | bool tags: - keystone-config -- include: keystone_federation_sp_idp_setup.yml +- include_tasks: keystone_federation_sp_idp_setup.yml when: - keystone_service_setup | bool - keystone_sp != {} @@ -143,8 +138,7 @@ - name: Flush handlers meta: flush_handlers -- include: keystone_idp_setup.yml - static: no +- include_tasks: keystone_idp_setup.yml when: keystone_idp != {} tags: - keystone-config