diff options
author | Scott Dodson <sdodson@redhat.com> | 2016-07-27 17:05:58 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-27 17:05:58 -0400 |
commit | 70e535c23eb99bbce590b5da29cbaf0cf1d2da28 (patch) | |
tree | 2c30df4b81520322497c11f5c00100796dda9f0a /roles/openshift_hosted/tasks/router/router.yml | |
parent | d4246bb6063383b7bb55a7c5a28d575214697f3c (diff) | |
parent | 4f2f94b69c41b116515dedb5039194085e17bb19 (diff) | |
download | openshift-70e535c23eb99bbce590b5da29cbaf0cf1d2da28.tar.gz openshift-70e535c23eb99bbce590b5da29cbaf0cf1d2da28.tar.bz2 openshift-70e535c23eb99bbce590b5da29cbaf0cf1d2da28.tar.xz openshift-70e535c23eb99bbce590b5da29cbaf0cf1d2da28.zip |
Merge pull request #2224 from dgoodwin/infra-count-fix
Fix registry/router being created despite no infra nodes.
Diffstat (limited to 'roles/openshift_hosted/tasks/router/router.yml')
-rw-r--r-- | roles/openshift_hosted/tasks/router/router.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_hosted/tasks/router/router.yml b/roles/openshift_hosted/tasks/router/router.yml index 7f3731c7d..d0a129c95 100644 --- a/roles/openshift_hosted/tasks/router/router.yml +++ b/roles/openshift_hosted/tasks/router/router.yml @@ -1,7 +1,7 @@ --- - fail: msg: "'certfile', 'keyfile' and 'cafile' keys must be specified when supplying the openshift_hosted_router_certificate variable." - when: openshift_hosted_router_certificate is defined and ('certfile' not in openshift_hosted_router_certificate or 'keyfile' not in openshift_hosted_router_certificate or 'cafile' not in openshift_hosted_router_certificate) + when: openshift_hosted_router_certificate is defined and ('certfile' not in openshift_hosted_router_certificate or 'keyfile' not in openshift_hosted_router_certificate or 'cafile' not in openshift_hosted_router_certificate) - name: Read router certificate and key become: no @@ -73,3 +73,4 @@ register: openshift_hosted_router_results changed_when: "'service exists' not in openshift_hosted_router_results.stdout" failed_when: "openshift_hosted_router_results.rc != 0 and 'service exists' not in openshift_hosted_router_results.stdout and 'deployment_config' not in openshift_hosted_router_results.stderr and 'service' not in openshift_hosted_router_results.stderr" + when: replicas | int > 0 |