summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2016-04-04 12:52:46 -0400
committerKenny Woodson <kwoodson@redhat.com>2016-04-04 12:52:46 -0400
commit5b8416ca765298ac5c739b34312e84492e79ebf8 (patch)
tree9b31774fb7e11fe709d224e74e02e273074b2fb5
parent0a8227ff3671c19fe46fa7b9bb483a3142b90c95 (diff)
parent39d0d18283ef47a73072588b3601290a8312ccd0 (diff)
downloadopenshift-5b8416ca765298ac5c739b34312e84492e79ebf8.tar.gz
openshift-5b8416ca765298ac5c739b34312e84492e79ebf8.tar.bz2
openshift-5b8416ca765298ac5c739b34312e84492e79ebf8.tar.xz
openshift-5b8416ca765298ac5c739b34312e84492e79ebf8.zip
Merge pull request #1701 from kwoodson/oceditfix
oc_edit requires name and content
-rw-r--r--roles/lib_openshift_api/build/ansible/edit.py5
-rw-r--r--roles/lib_openshift_api/library/oc_edit.py5
2 files changed, 6 insertions, 4 deletions
diff --git a/roles/lib_openshift_api/build/ansible/edit.py b/roles/lib_openshift_api/build/ansible/edit.py
index d48bc7a01..275789298 100644
--- a/roles/lib_openshift_api/build/ansible/edit.py
+++ b/roles/lib_openshift_api/build/ansible/edit.py
@@ -12,16 +12,17 @@ def main():
choices=['present']),
debug=dict(default=False, type='bool'),
namespace=dict(default='default', type='str'),
- name=dict(default=None, type='str'),
+ name=dict(default=None, required=True, type='str'),
kind=dict(required=True,
type='str',
choices=['dc', 'deploymentconfig',
'svc', 'service',
+ 'scc', 'securitycontextconstraints',
'secret',
]),
file_name=dict(default=None, type='str'),
file_format=dict(default='yaml', type='str'),
- content=dict(default=None, type='dict'),
+ content=dict(default=None, required=True, type='dict'),
force=dict(default=False, type='bool'),
),
supports_check_mode=True,
diff --git a/roles/lib_openshift_api/library/oc_edit.py b/roles/lib_openshift_api/library/oc_edit.py
index 0135dba63..1e2a41077 100644
--- a/roles/lib_openshift_api/library/oc_edit.py
+++ b/roles/lib_openshift_api/library/oc_edit.py
@@ -539,16 +539,17 @@ def main():
choices=['present']),
debug=dict(default=False, type='bool'),
namespace=dict(default='default', type='str'),
- name=dict(default=None, type='str'),
+ name=dict(default=None, required=True, type='str'),
kind=dict(required=True,
type='str',
choices=['dc', 'deploymentconfig',
'svc', 'service',
+ 'scc', 'securitycontextconstraints',
'secret',
]),
file_name=dict(default=None, type='str'),
file_format=dict(default='yaml', type='str'),
- content=dict(default=None, type='dict'),
+ content=dict(default=None, required=True, type='dict'),
force=dict(default=False, type='bool'),
),
supports_check_mode=True,