summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-02-27 19:28:26 -0500
committerKenny Woodson <kwoodson@redhat.com>2017-02-28 09:29:21 -0500
commit05cad0edaf365e5080b54d48ceb3f75396b78e4e (patch)
tree188956b95e888b9d34ebc7632b9a312b21121a7b
parent74e890482f2be933634286f8b4cf488287cf6d39 (diff)
downloadopenshift-05cad0edaf365e5080b54d48ceb3f75396b78e4e.tar.gz
openshift-05cad0edaf365e5080b54d48ceb3f75396b78e4e.tar.bz2
openshift-05cad0edaf365e5080b54d48ceb3f75396b78e4e.tar.xz
openshift-05cad0edaf365e5080b54d48ceb3f75396b78e4e.zip
Fixed logic error. Ensure both svc and dc exist.
-rw-r--r--roles/lib_openshift/library/oc_adm_registry.py2
-rw-r--r--roles/lib_openshift/src/class/oc_adm_registry.py2
2 files changed, 2 insertions, 2 deletions
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