diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-14 17:22:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-14 17:22:13 -0800 |
| commit | dbbfefbdeb6336105e415cb478193800e11a3134 (patch) | |
| tree | bb8e39a8a7bc15124133ce498006929df9b46d74 | |
| parent | 7720205484c43dc90b5b333522c53670e0ad2820 (diff) | |
| parent | 378ca6c5642f11dd6610b012ebe4bdd296118f61 (diff) | |
| download | openshift-dbbfefbdeb6336105e415cb478193800e11a3134.tar.gz openshift-dbbfefbdeb6336105e415cb478193800e11a3134.tar.bz2 openshift-dbbfefbdeb6336105e415cb478193800e11a3134.tar.xz openshift-dbbfefbdeb6336105e415cb478193800e11a3134.zip | |
Merge pull request #6081 from kwoodson/remove_oc_edit_restrictions
Automatic merge from submit-queue.
removing kind restrictions from oc_edit
Removing any kind restriction on oc_edit. This allows it to just call the API which in most cases works.
| -rw-r--r-- | roles/lib_openshift/library/oc_edit.py | 15 | ||||
| -rw-r--r-- | roles/lib_openshift/src/ansible/oc_edit.py | 15 |
2 files changed, 2 insertions, 28 deletions
diff --git a/roles/lib_openshift/library/oc_edit.py b/roles/lib_openshift/library/oc_edit.py index 0b6a8436b..0cea07256 100644 --- a/roles/lib_openshift/library/oc_edit.py +++ b/roles/lib_openshift/library/oc_edit.py @@ -1556,20 +1556,7 @@ def main(): debug=dict(default=False, type='bool'), namespace=dict(default='default', type='str'), name=dict(default=None, required=True, type='str'), - kind=dict(required=True, - type='str', - choices=['dc', 'deploymentconfig', - 'rc', 'replicationcontroller', - 'svc', 'service', - 'scc', 'securitycontextconstraints', - 'ns', 'namespace', 'project', 'projects', - 'is', 'imagestream', - 'istag', 'imagestreamtag', - 'bc', 'buildconfig', - 'routes', - 'node', - 'secret', - 'pv', 'persistentvolume']), + kind=dict(required=True, type='str'), file_name=dict(default=None, type='str'), file_format=dict(default='yaml', type='str'), content=dict(default=None, required=True, type='dict'), diff --git a/roles/lib_openshift/src/ansible/oc_edit.py b/roles/lib_openshift/src/ansible/oc_edit.py index 5c5954747..221047393 100644 --- a/roles/lib_openshift/src/ansible/oc_edit.py +++ b/roles/lib_openshift/src/ansible/oc_edit.py @@ -15,20 +15,7 @@ def main(): debug=dict(default=False, type='bool'), namespace=dict(default='default', type='str'), name=dict(default=None, required=True, type='str'), - kind=dict(required=True, - type='str', - choices=['dc', 'deploymentconfig', - 'rc', 'replicationcontroller', - 'svc', 'service', - 'scc', 'securitycontextconstraints', - 'ns', 'namespace', 'project', 'projects', - 'is', 'imagestream', - 'istag', 'imagestreamtag', - 'bc', 'buildconfig', - 'routes', - 'node', - 'secret', - 'pv', 'persistentvolume']), + kind=dict(required=True, type='str'), file_name=dict(default=None, type='str'), file_format=dict(default='yaml', type='str'), content=dict(default=None, required=True, type='dict'), |