summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-08-28 09:00:18 -0400
committerGitHub <noreply@github.com>2017-08-28 09:00:18 -0400
commit6f2d7f9f041e8a5a791575849ad626f5a8c0aae2 (patch)
tree989ef727c2cf4f9d6e2efdfa06c0002241d6218b
parentcc45402b22703aedb9986fa9a95f530a11633edb (diff)
parentc527ad3ceb87ffaff0abdca3e39f8b6c7faeea5b (diff)
downloadopenshift-6f2d7f9f041e8a5a791575849ad626f5a8c0aae2.tar.gz
openshift-6f2d7f9f041e8a5a791575849ad626f5a8c0aae2.tar.bz2
openshift-6f2d7f9f041e8a5a791575849ad626f5a8c0aae2.tar.xz
openshift-6f2d7f9f041e8a5a791575849ad626f5a8c0aae2.zip
Merge pull request #5231 from kwoodson/removing_dep_warn
Removing deprecation warnings for when conditions.
-rw-r--r--roles/openshift_aws_ami_copy/tasks/main.yml2
-rw-r--r--roles/openshift_aws_iam_kms/tasks/main.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_aws_ami_copy/tasks/main.yml b/roles/openshift_aws_ami_copy/tasks/main.yml
index 15444c8d0..bcccd4042 100644
--- a/roles/openshift_aws_ami_copy/tasks/main.yml
+++ b/roles/openshift_aws_ami_copy/tasks/main.yml
@@ -1,7 +1,7 @@
---
- fail:
msg: "{{ item }} needs to be defined"
- when: "{{ item }} is not defined"
+ when: item is not defined
with_items:
- r_openshift_aws_ami_copy_src_ami
- r_openshift_aws_ami_copy_name
diff --git a/roles/openshift_aws_iam_kms/tasks/main.yml b/roles/openshift_aws_iam_kms/tasks/main.yml
index b541b466c..32aac2666 100644
--- a/roles/openshift_aws_iam_kms/tasks/main.yml
+++ b/roles/openshift_aws_iam_kms/tasks/main.yml
@@ -1,7 +1,7 @@
---
- fail:
msg: "{{ item.name }} needs to be defined."
- when: "{{ item.cond }}"
+ when: item.cond | bool
with_items:
- name: "{{ r_openshift_aws_iam_kms_alias }}"
cond: "{{ r_openshift_aws_iam_kms_alias is undefined }}"