summaryrefslogtreecommitdiffstats
path: root/roles/lib_openshift/src
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-04-03 16:25:37 -0400
committerKenny Woodson <kwoodson@redhat.com>2017-04-05 09:45:20 -0400
commit68a20d2d6371da77a640d9d79d3fa7cf6edb5319 (patch)
treed72ef6c15f49177d320f9f096db0eede8321b8ee /roles/lib_openshift/src
parent138e3668b61cbf2d9482a7128e731c0df7000178 (diff)
downloadopenshift-68a20d2d6371da77a640d9d79d3fa7cf6edb5319.tar.gz
openshift-68a20d2d6371da77a640d9d79d3fa7cf6edb5319.tar.bz2
openshift-68a20d2d6371da77a640d9d79d3fa7cf6edb5319.tar.xz
openshift-68a20d2d6371da77a640d9d79d3fa7cf6edb5319.zip
Fixed
name and selector to be mutually exclusive
Diffstat (limited to 'roles/lib_openshift/src')
-rw-r--r--roles/lib_openshift/src/ansible/oc_obj.py2
-rw-r--r--roles/lib_openshift/src/class/oc_adm_router.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/lib_openshift/src/ansible/oc_obj.py b/roles/lib_openshift/src/ansible/oc_obj.py
index 701740e4f..4ace53c1e 100644
--- a/roles/lib_openshift/src/ansible/oc_obj.py
+++ b/roles/lib_openshift/src/ansible/oc_obj.py
@@ -23,7 +23,7 @@ def main():
force=dict(default=False, type='bool'),
selector=dict(default=None, type='str'),
),
- mutually_exclusive=[["content", "files"]],
+ mutually_exclusive=[["content", "files"],["selector", "name"]],
supports_check_mode=True,
)
diff --git a/roles/lib_openshift/src/class/oc_adm_router.py b/roles/lib_openshift/src/class/oc_adm_router.py
index 356d06fdf..1a0b94b80 100644
--- a/roles/lib_openshift/src/class/oc_adm_router.py
+++ b/roles/lib_openshift/src/class/oc_adm_router.py
@@ -136,7 +136,7 @@ class Router(OpenShiftCLI):
self.secret = None
self.rolebinding = None
for part in self.router_parts:
- result = self._get(part['kind'], rname=part['name'])
+ result = self._get(part['kind'], name=part['name'])
if result['returncode'] == 0 and part['kind'] == 'dc':
self.deploymentconfig = DeploymentConfig(result['results'][0])
elif result['returncode'] == 0 and part['kind'] == 'svc':