Change include: to include_tasks:
This removes warnings in Ansible 2.4+. The patch also removes "static:" from the playbooks since that argument is no longer used by Ansible. Change-Id: I6e5fcbccd4239db73de20e640a3423d1a2333bbe
This commit is contained in:
Major Hayden
parent
b4333f043f
commit
b7b9db7bb4
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -30,4 +30,4 @@
|
|||
- Manage LB
|
||||
- Restart uWSGI
|
||||
|
||||
- include: "keystone_init_{{ ansible_service_mgr }}.yml"
|
||||
- include_tasks: "keystone_init_{{ ansible_service_mgr }}.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
|
||||
|
|
|
|||
Loading…
Reference in New Issue