summaryrefslogtreecommitdiffstats
path: root/roles/lib_openshift/library
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-04-03 15:23:41 -0500
committerGitHub <noreply@github.com>2017-04-03 15:23:41 -0500
commit62a49cc8620db5ac0add61727229ac35d0be2b3c (patch)
tree0ff134fadc88f3605a3ef2efccdac6a4cfc0bcb7 /roles/lib_openshift/library
parent0bac74c346bb5c620bdf1941b40c29ff3083e2b0 (diff)
parent1002d6f1a23ed13bde64d8c4e3f21946d81e702e (diff)
downloadopenshift-62a49cc8620db5ac0add61727229ac35d0be2b3c.tar.gz
openshift-62a49cc8620db5ac0add61727229ac35d0be2b3c.tar.bz2
openshift-62a49cc8620db5ac0add61727229ac35d0be2b3c.tar.xz
openshift-62a49cc8620db5ac0add61727229ac35d0be2b3c.zip
Merge pull request #3830 from kwoodson/oc_process_fix
Merged by openshift-bot
Diffstat (limited to 'roles/lib_openshift/library')
-rw-r--r--roles/lib_openshift/library/oc_process.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/roles/lib_openshift/library/oc_process.py b/roles/lib_openshift/library/oc_process.py
index d487746eb..112d9ab5f 100644
--- a/roles/lib_openshift/library/oc_process.py
+++ b/roles/lib_openshift/library/oc_process.py
@@ -1545,7 +1545,7 @@ class OCProcess(OpenShiftCLI):
if api_rval['returncode'] != 0:
return {"failed": True, "msg" : api_rval}
- return {"changed" : False, "results": api_rval, "state": "list"}
+ return {"changed" : False, "results": api_rval, "state": state}
elif state == 'present':
if check_mode and params['create']:
@@ -1567,9 +1567,9 @@ class OCProcess(OpenShiftCLI):
return {"failed": True, "msg": api_rval}
if params['create']:
- return {"changed": True, "results": api_rval, "state": "present"}
+ return {"changed": True, "results": api_rval, "state": state}
- return {"changed": False, "results": api_rval, "state": "present"}
+ return {"changed": False, "results": api_rval, "state": state}
# verify results
update = False
@@ -1584,13 +1584,13 @@ class OCProcess(OpenShiftCLI):
update = True
if not update:
- return {"changed": update, "results": api_rval, "state": "present"}
+ return {"changed": update, "results": api_rval, "state": state}
for cmd in rval:
if cmd['returncode'] != 0:
- return {"failed": True, "changed": update, "results": rval, "state": "present"}
+ return {"failed": True, "changed": update, "msg": rval, "state": state}
- return {"changed": update, "results": rval, "state": "present"}
+ return {"changed": update, "results": rval, "state": state}
# -*- -*- -*- End included fragment: class/oc_process.py -*- -*- -*-