Include Deprecation - openshift-service-catalog

playbooks/openshift-service-catalog/config.yml

@@ -1,4 +1,4 @@
 ---
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
 
-- include: private/config.yml
+- import_playbook: private/config.yml

roles/ansible_service_broker/tasks/install.yml

@@ -30,9 +30,9 @@
     ansible_service_broker_image: "{{ ansible_service_broker_image_prefix }}ansible-service-broker:{{ ansible_service_broker_image_tag }}"
     ansible_service_broker_etcd_image: "{{ ansible_service_broker_etcd_image_prefix }}etcd:{{ ansible_service_broker_etcd_image_tag }}"
 
-- include: validate_facts.yml
+- include_tasks: validate_facts.yml
 
-- include: generate_certs.yml
+- include_tasks: generate_certs.yml
 
 # Deployment of ansible-service-broker starts here
 - name: create openshift-ansible-service-broker project

roles/ansible_service_broker/tasks/main.yml

@@ -1,8 +1,8 @@
 ---
 # do any asserts here
 
-- include: install.yml
+- include_tasks: install.yml
   when: ansible_service_broker_install | bool
 
-- include: remove.yml
+- include_tasks: remove.yml
   when: ansible_service_broker_remove | bool

roles/openshift_service_catalog/tasks/install.yml

@@ -40,7 +40,7 @@
       command: >
         {{ openshift.common.client_binary }} --config=/etc/origin/master/admin.kubeconfig adm pod-network make-projects-global kube-service-catalog
 
-- include: generate_certs.yml
+- include_tasks: generate_certs.yml
 
 - copy:
     src: kubeservicecatalog_roles_bindings.yml
@@ -252,7 +252,7 @@
     session_affinity: None
     service_type: ClusterIP
 
-- include: start_api_server.yml
+- include_tasks: start_api_server.yml
 
 - name: Delete temp directory
   file:

roles/openshift_service_catalog/tasks/main.yml

@@ -1,8 +1,8 @@
 ---
 # do any asserts here
 
-- include: install.yml
+- include_tasks: install.yml
   when: not openshift_service_catalog_remove | default(false) | bool
 
-- include: remove.yml
+- include_tasks: remove.yml
   when: openshift_service_catalog_remove | default(false) | bool

roles/template_service_broker/tasks/main.yml

@@ -1,8 +1,8 @@
 ---
 # do any asserts here
 
-- include: install.yml
+- include_tasks: install.yml
   when: template_service_broker_install | bool
 
-- include: remove.yml
+- include_tasks: remove.yml
   when: template_service_broker_remove | bool