From 05cad0edaf365e5080b54d48ceb3f75396b78e4e Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Mon, 27 Feb 2017 19:28:26 -0500 Subject: Fixed logic error. Ensure both svc and dc exist. --- roles/lib_openshift/library/oc_adm_registry.py | 2 +- roles/lib_openshift/src/class/oc_adm_registry.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'roles') diff --git a/roles/lib_openshift/library/oc_adm_registry.py b/roles/lib_openshift/library/oc_adm_registry.py index a2c4515aa..338d25351 100644 --- a/roles/lib_openshift/library/oc_adm_registry.py +++ b/roles/lib_openshift/library/oc_adm_registry.py @@ -2259,7 +2259,7 @@ class Registry(OpenShiftCLI): def exists(self): '''does the object exist?''' self.get() - if self.deploymentconfig or self.service: + if self.deploymentconfig and self.service: return True return False diff --git a/roles/lib_openshift/src/class/oc_adm_registry.py b/roles/lib_openshift/src/class/oc_adm_registry.py index 06de2ba12..92ebda235 100644 --- a/roles/lib_openshift/src/class/oc_adm_registry.py +++ b/roles/lib_openshift/src/class/oc_adm_registry.py @@ -120,7 +120,7 @@ class Registry(OpenShiftCLI): def exists(self): '''does the object exist?''' self.get() - if self.deploymentconfig or self.service: + if self.deploymentconfig and self.service: return True return False -- cgit v1.2.3