diff options
| author | Russell Teague <rteague@redhat.com> | 2017-11-21 16:59:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 16:59:31 -0500 |
| commit | c007db1a6520b084edc7154fae863d67c230fe4b (patch) | |
| tree | a6a0c625ab4ad54030d3a1eecf92e6489faab7fe /roles/openshift_sanitize_inventory | |
| parent | 8255f668ebac12171098f5ba6cbb74370ec3141c (diff) | |
| parent | a4c533e2a567562248768b2bc4998d1a36810894 (diff) | |
| download | openshift-c007db1a6520b084edc7154fae863d67c230fe4b.tar.gz openshift-c007db1a6520b084edc7154fae863d67c230fe4b.tar.bz2 openshift-c007db1a6520b084edc7154fae863d67c230fe4b.tar.xz openshift-c007db1a6520b084edc7154fae863d67c230fe4b.zip | |
Merge pull request #6144 from mtnbikenc/init-include-deprecation
Include Deprecation - Init Playbook Paths
Diffstat (limited to 'roles/openshift_sanitize_inventory')
| -rw-r--r-- | roles/openshift_sanitize_inventory/tasks/deprecations.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_sanitize_inventory/tasks/main.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_sanitize_inventory/tasks/deprecations.yml b/roles/openshift_sanitize_inventory/tasks/deprecations.yml index 94d3acffc..795b8ee60 100644 --- a/roles/openshift_sanitize_inventory/tasks/deprecations.yml +++ b/roles/openshift_sanitize_inventory/tasks/deprecations.yml @@ -16,6 +16,6 @@ # for with_fileglob Ansible resolves the path relative to the roles/<rolename>/files directory - name: Assign deprecated variables to correct counterparts - include: "{{ item }}" + include_tasks: "{{ item }}" with_fileglob: - "../tasks/__deprecations_*.yml" diff --git a/roles/openshift_sanitize_inventory/tasks/main.yml b/roles/openshift_sanitize_inventory/tasks/main.yml index 70b236033..77428272c 100644 --- a/roles/openshift_sanitize_inventory/tasks/main.yml +++ b/roles/openshift_sanitize_inventory/tasks/main.yml @@ -1,7 +1,7 @@ --- # We should print out deprecations prior to any failures so that if a play does fail for other reasons # the user would also be aware of any deprecated variables they should note to adjust -- include: deprecations.yml +- include_tasks: deprecations.yml - name: Abort when conflicting deployment type variables are set when: @@ -53,7 +53,7 @@ openshift_release is "{{ openshift_release }}" which is not a valid version string. Please set it to a version string like "3.4". -- include: unsupported.yml +- include_tasks: unsupported.yml when: - not openshift_enable_unsupported_configurations | default(false) | bool |