diff options
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/lib_openshift/library/oc_adm_router.py | 2 | ||||
| -rw-r--r-- | roles/lib_openshift/library/oc_obj.py | 2 | ||||
| -rw-r--r-- | roles/lib_openshift/src/ansible/oc_obj.py | 2 | ||||
| -rw-r--r-- | roles/lib_openshift/src/class/oc_adm_router.py | 2 | 
4 files changed, 4 insertions, 4 deletions
| diff --git a/roles/lib_openshift/library/oc_adm_router.py b/roles/lib_openshift/library/oc_adm_router.py index bb377b32d..0e4b336fb 100644 --- a/roles/lib_openshift/library/oc_adm_router.py +++ b/roles/lib_openshift/library/oc_adm_router.py @@ -2689,7 +2689,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': diff --git a/roles/lib_openshift/library/oc_obj.py b/roles/lib_openshift/library/oc_obj.py index bf6aded48..5a90f1805 100644 --- a/roles/lib_openshift/library/oc_obj.py +++ b/roles/lib_openshift/library/oc_obj.py @@ -1647,7 +1647,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/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': | 
