diff options
| author | Russell Teague <rteague@redhat.com> | 2017-12-06 09:48:59 -0500 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-12-06 09:48:59 -0500 |
| commit | 50751e3c5e8e8dca97cd27d4c93944515666c8b5 (patch) | |
| tree | 2ae261e69fd2d099c1be3d5790762c39e2e809b1 /roles/openshift_hosted/tasks/registry.yml | |
| parent | 9099dc40ea3f75a2d9d87ba8f30400764508170b (diff) | |
| download | openshift-50751e3c5e8e8dca97cd27d4c93944515666c8b5.tar.gz openshift-50751e3c5e8e8dca97cd27d4c93944515666c8b5.tar.bz2 openshift-50751e3c5e8e8dca97cd27d4c93944515666c8b5.tar.xz openshift-50751e3c5e8e8dca97cd27d4c93944515666c8b5.zip | |
Include Deprecation: Convert to include_tasks
Diffstat (limited to 'roles/openshift_hosted/tasks/registry.yml')
| -rw-r--r-- | roles/openshift_hosted/tasks/registry.yml | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/roles/openshift_hosted/tasks/registry.yml b/roles/openshift_hosted/tasks/registry.yml index 4797fb788..de302c740 100644 --- a/roles/openshift_hosted/tasks/registry.yml +++ b/roles/openshift_hosted/tasks/registry.yml @@ -6,7 +6,7 @@ check_mode: no - name: setup firewall - include: firewall.yml + import_tasks: firewall.yml vars: l_openshift_hosted_firewall_enabled: "{{ r_openshift_hosted_registry_firewall_enabled }}" l_openshift_hosted_use_firewalld: "{{ r_openshift_hosted_registry_use_firewalld }}" @@ -94,14 +94,12 @@ service_type: ClusterIP clusterip: '{{ openshift_hosted_registry_clusterip | default(omit) }}' -- include: secure.yml - static: no +- include_tasks: secure.yml run_once: true when: - not (openshift_docker_hosted_registry_insecure | default(False)) | bool -- include: storage/object_storage.yml - static: no +- include_tasks: storage/object_storage.yml when: - openshift_hosted_registry_storage_kind | default(none) == 'object' @@ -116,7 +114,7 @@ when: - openshift_hosted_registry_storage_kind | default(none) in ['nfs', 'openstack', 'glusterfs'] -- include: storage/glusterfs_endpoints.yml +- include_tasks: storage/glusterfs_endpoints.yml when: - openshift_hosted_registry_storage_glusterfs_ips|length > 0 - openshift_hosted_registry_storage_kind | default(none) in ['glusterfs'] @@ -141,12 +139,12 @@ namespace: "{{ openshift_hosted_registry_namespace }}" - name: Wait for pod (Registry) - include: wait_for_pod.yml + include_tasks: wait_for_pod.yml vars: l_openshift_hosted_wait_for_pod: "{{ openshift_hosted_registry_wait }}" l_openshift_hosted_wfp_items: "{{ r_openshift_hosted_registry_list }}" -- include: storage/glusterfs.yml +- include_tasks: storage/glusterfs.yml when: - openshift_hosted_registry_storage_kind | default(none) == 'glusterfs' or openshift_hosted_registry_storage_glusterfs_swap |