summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@afrolegs.com>2017-08-14 09:58:22 -0400
committerGitHub <noreply@github.com>2017-08-14 09:58:22 -0400
commitfa32667b734054200b516499047055c7c9f91fa2 (patch)
tree50941bcaf4c8dd7c13458f663d86fd570887963c
parent58c50844ad6ffe1162322c2d8d621104f750cbc7 (diff)
parent0f84a11fbeb3bd3b05335e70558357cd133ce8b6 (diff)
downloadopenshift-fa32667b734054200b516499047055c7c9f91fa2.tar.gz
openshift-fa32667b734054200b516499047055c7c9f91fa2.tar.bz2
openshift-fa32667b734054200b516499047055c7c9f91fa2.tar.xz
openshift-fa32667b734054200b516499047055c7c9f91fa2.zip
Merge pull request #5055 from fraenkel/fix_aws
Fix Restore Master AWS Options
-rw-r--r--roles/openshift_master/tasks/systemd_units.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/tasks/systemd_units.yml b/roles/openshift_master/tasks/systemd_units.yml
index 3affdd348..723bdb0c4 100644
--- a/roles/openshift_master/tasks/systemd_units.yml
+++ b/roles/openshift_master/tasks/systemd_units.yml
@@ -70,7 +70,7 @@
with_items: "{{ master_api_proxy.stdout_lines | default([]) }}"
- name: Restore Master API AWS Options
- when: bool and openshift.master.cluster_method == "native"
+ when: openshift.master.cluster_method == "native"
and master_api_aws.rc == 0 and
not (openshift_cloudprovider_kind is defined and openshift_cloudprovider_kind == 'aws' and openshift_cloudprovider_aws_access_key is defined and openshift_cloudprovider_aws_secret_key is defined)
lineinfile: