diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-12-07 08:11:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-07 08:11:19 -0800 |
| commit | e5faa36d01cba99c2f1e67cfd126f5b5be11d367 (patch) | |
| tree | 2885de4ef2e3a783e99fdb3d95464f98ab495284 /roles/openshift_openstack | |
| parent | 5a13532a2129b0226d24cdc88b5e73ff67d43f5e (diff) | |
| parent | 50751e3c5e8e8dca97cd27d4c93944515666c8b5 (diff) | |
| download | openshift-e5faa36d01cba99c2f1e67cfd126f5b5be11d367.tar.gz openshift-e5faa36d01cba99c2f1e67cfd126f5b5be11d367.tar.bz2 openshift-e5faa36d01cba99c2f1e67cfd126f5b5be11d367.tar.xz openshift-e5faa36d01cba99c2f1e67cfd126f5b5be11d367.zip | |
Merge pull request #6372 from mtnbikenc/include-to-include_tasks
Automatic merge from submit-queue.
Include Deprecation: Convert to include_tasks
For all roles/
* Converts to include_tasks: for dynamic includes
* Converts to import_tasks: for static includes
Trello: https://trello.com/c/ZTyZu3UM/484-3-ansible-24-include-deprecation
Diffstat (limited to 'roles/openshift_openstack')
| -rw-r--r-- | roles/openshift_openstack/tasks/check-prerequisites.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_openstack/tasks/node-configuration.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_openstack/tasks/provision.yml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/roles/openshift_openstack/tasks/check-prerequisites.yml b/roles/openshift_openstack/tasks/check-prerequisites.yml index 0ef60459f..30996cc47 100644 --- a/roles/openshift_openstack/tasks/check-prerequisites.yml +++ b/roles/openshift_openstack/tasks/check-prerequisites.yml @@ -87,7 +87,7 @@ msg: "Keypair {{ openshift_openstack_keypair_name }} is not available" # Check that custom images are available -- include: custom_image_check.yaml +- include_tasks: custom_image_check.yaml with_items: - "{{ openshift_openstack_master_image }}" - "{{ openshift_openstack_infra_image }}" @@ -96,7 +96,7 @@ - "{{ openshift_openstack_etcd_image }}" # Check that custom flavors are available -- include: custom_flavor_check.yaml +- include_tasks: custom_flavor_check.yaml with_items: - "{{ openshift_openstack_master_flavor }}" - "{{ openshift_openstack_infra_flavor }}" diff --git a/roles/openshift_openstack/tasks/node-configuration.yml b/roles/openshift_openstack/tasks/node-configuration.yml index 53e3bb28c..59df2e396 100644 --- a/roles/openshift_openstack/tasks/node-configuration.yml +++ b/roles/openshift_openstack/tasks/node-configuration.yml @@ -4,6 +4,6 @@ msg: "SELinux is required for OpenShift and has been detected as '{{ ansible_selinux.config_mode }}'" when: ansible_selinux.config_mode != "enforcing" -- include: container-storage-setup.yml +- include_tasks: container-storage-setup.yml -- include: node-network.yml +- include_tasks: node-network.yml diff --git a/roles/openshift_openstack/tasks/provision.yml b/roles/openshift_openstack/tasks/provision.yml index dccbe334c..b774bd620 100644 --- a/roles/openshift_openstack/tasks/provision.yml +++ b/roles/openshift_openstack/tasks/provision.yml @@ -1,6 +1,6 @@ --- - name: Generate the templates - include: generate-templates.yml + include_tasks: generate-templates.yml when: - openshift_openstack_stack_state == 'present' @@ -17,7 +17,7 @@ meta: refresh_inventory - name: CleanUp - include: cleanup.yml + include_tasks: cleanup.yml when: - openshift_openstack_stack_state == 'present' |