summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/tasks
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-06 16:39:28 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-06 16:39:28 -0400
commit6bae44332be495310dca9520518bf5d0776ae4c8 (patch)
tree6ef2069cd62d14aa7545e2ee3c6b646e3262287c /roles/openshift_node/tasks
parent29a226f215bd2540836f883b6794efb532b8c5dd (diff)
parentca2325e9eb9d0b4f8a9a611b01bbc93c87fc12b7 (diff)
downloadopenshift-6bae44332be495310dca9520518bf5d0776ae4c8.tar.gz
openshift-6bae44332be495310dca9520518bf5d0776ae4c8.tar.bz2
openshift-6bae44332be495310dca9520518bf5d0776ae4c8.tar.xz
openshift-6bae44332be495310dca9520518bf5d0776ae4c8.zip
Merge pull request #1699 from abutcher/check-cloudprovider-kind
Check for kind in cloudprovider facts prior to accessing.
Diffstat (limited to 'roles/openshift_node/tasks')
-rw-r--r--roles/openshift_node/tasks/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 80b3e710d..eca4848c1 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -92,7 +92,7 @@
line: "AWS_ACCESS_KEY_ID={{ openshift.cloudprovider.aws.access_key }}"
- regex: '^AWS_SECRET_ACCESS_KEY='
line: "AWS_SECRET_ACCESS_KEY={{ openshift.cloudprovider.aws.secret_key }}"
- when: "'cloudprovider' in openshift and 'aws' in openshift.cloudprovider and openshift.cloudprovider.kind == 'aws' and 'access_key' in openshift.cloudprovider.aws and 'secret_key' in openshift.cloudprovider.aws"
+ when: "'cloudprovider' in openshift and 'aws' in openshift.cloudprovider and 'kind' in openshift.cloudprovider and openshift.cloudprovider.kind == 'aws' and 'access_key' in openshift.cloudprovider.aws and 'secret_key' in openshift.cloudprovider.aws"
notify:
- restart node