diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-03-01 16:54:14 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-03-01 16:54:14 -0500 |
| commit | 8621904168b5e99cbf03158d888e6883e627e1e9 (patch) | |
| tree | d712353a12bcbb1c4fb8706b1480da75c4d4eedf | |
| parent | 00683cbb4b222f702b8367b8d259d8e7049d2a8e (diff) | |
| download | openshift-8621904168b5e99cbf03158d888e6883e627e1e9.tar.gz openshift-8621904168b5e99cbf03158d888e6883e627e1e9.tar.bz2 openshift-8621904168b5e99cbf03158d888e6883e627e1e9.tar.xz openshift-8621904168b5e99cbf03158d888e6883e627e1e9.zip | |
Fixed error handling when oc adm ca create-server-cert fails. Fixed a logic error in secure.
| -rw-r--r-- | roles/lib_openshift/library/oc_adm_ca_server_cert.py | 3 | ||||
| -rw-r--r-- | roles/lib_openshift/src/class/oc_adm_ca_server_cert.py | 3 | ||||
| -rw-r--r-- | roles/openshift_hosted/tasks/registry/secure.yml | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/roles/lib_openshift/library/oc_adm_ca_server_cert.py b/roles/lib_openshift/library/oc_adm_ca_server_cert.py index 9390ea7c1..74ef57b4e 100644 --- a/roles/lib_openshift/library/oc_adm_ca_server_cert.py +++ b/roles/lib_openshift/library/oc_adm_ca_server_cert.py @@ -1492,6 +1492,9 @@ class CAServerCert(OpenShiftCLI): api_rval = server_cert.create() + if api_rval['returncode'] != 0: + return {'Failed': True, 'msg': api_rval} + return {'changed': True, 'results': api_rval, 'state': state} ######## diff --git a/roles/lib_openshift/src/class/oc_adm_ca_server_cert.py b/roles/lib_openshift/src/class/oc_adm_ca_server_cert.py index 6ed1f2f35..18c69f2fa 100644 --- a/roles/lib_openshift/src/class/oc_adm_ca_server_cert.py +++ b/roles/lib_openshift/src/class/oc_adm_ca_server_cert.py @@ -122,6 +122,9 @@ class CAServerCert(OpenShiftCLI): api_rval = server_cert.create() + if api_rval['returncode'] != 0: + return {'Failed': True, 'msg': api_rval} + return {'changed': True, 'results': api_rval, 'state': state} ######## diff --git a/roles/openshift_hosted/tasks/registry/secure.yml b/roles/openshift_hosted/tasks/registry/secure.yml index bd513b943..f9ea2ebeb 100644 --- a/roles/openshift_hosted/tasks/registry/secure.yml +++ b/roles/openshift_hosted/tasks/registry/secure.yml @@ -8,7 +8,7 @@ backup: True dest: "/etc/origin/master/named_certificates/{{ item.value | basename }}" src: "{{ item.value }}" - when: item.key in ['certfile', 'keyfile', 'cafile'] and item.value is not None + when: item.key in ['certfile', 'keyfile', 'cafile'] and item.value with_dict: "{{ openshift_hosted_registry_routecertificates }}" # When certificates are defined we will create the reencrypt |