summaryrefslogtreecommitdiffstats
path: root/roles/lib_openshift/src/ansible
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-03-23 16:24:20 -0400
committerKenny Woodson <kwoodson@redhat.com>2017-03-23 16:24:20 -0400
commit8cc12c32d35ae0a86f13110d6ea9bdb6a411bbc9 (patch)
treeba8b621c1006b5d2dd2b2670f7bcffc79d36ef66 /roles/lib_openshift/src/ansible
parentac9aecc926293ba2138b3fed0aa04288ee1ef970 (diff)
downloadopenshift-8cc12c32d35ae0a86f13110d6ea9bdb6a411bbc9.tar.gz
openshift-8cc12c32d35ae0a86f13110d6ea9bdb6a411bbc9.tar.bz2
openshift-8cc12c32d35ae0a86f13110d6ea9bdb6a411bbc9.tar.xz
openshift-8cc12c32d35ae0a86f13110d6ea9bdb6a411bbc9.zip
Fixing up test cases, linting, and added a return.
Diffstat (limited to 'roles/lib_openshift/src/ansible')
-rw-r--r--roles/lib_openshift/src/ansible/oc_image.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/roles/lib_openshift/src/ansible/oc_image.py b/roles/lib_openshift/src/ansible/oc_image.py
index f7c52ace0..447d62f20 100644
--- a/roles/lib_openshift/src/ansible/oc_image.py
+++ b/roles/lib_openshift/src/ansible/oc_image.py
@@ -15,9 +15,8 @@ def main():
debug=dict(default=False, type='bool'),
namespace=dict(default='default', type='str'),
registry_url=dict(default=None, type='str'),
- image_name=dict(default=None, type='str'),
+ image_name=dict(default=None, required=True, type='str'),
image_tag=dict(default=None, type='str'),
- content_type=dict(default='raw', choices=['yaml', 'json', 'raw'], type='str'),
force=dict(default=False, type='bool'),
),
@@ -25,11 +24,11 @@ def main():
)
rval = OCImage.run_ansible(module.params, module.check_mode)
+
if 'failed' in rval:
module.fail_json(**rval)
module.exit_json(**rval)
-
if __name__ == '__main__':
main()