diff --git a/.zuul.yaml b/.zuul.yaml index 154757d18..6bfea29f3 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -285,7 +285,7 @@ - nodepool-nox-py311 - nodepool-functional-container-openstack-release - nodepool-functional-k8s - - nodepool-functional-openshift + # - nodepool-functional-openshift - zuul-quick-start: requires: zuul-container-image dependencies: nodepool-build-image @@ -299,7 +299,7 @@ nodeset: ubuntu-focal - nodepool-nox-py311 - nodepool-functional-k8s - - nodepool-functional-openshift + # - nodepool-functional-openshift - zuul-quick-start: requires: zuul-container-image dependencies: nodepool-upload-image diff --git a/nodepool/driver/openstack/adapter.py b/nodepool/driver/openstack/adapter.py index dbb287744..29b01220b 100644 --- a/nodepool/driver/openstack/adapter.py +++ b/nodepool/driver/openstack/adapter.py @@ -995,7 +995,7 @@ class OpenStackAdapter(statemachine.Adapter): # some openstacksdk's return True if any port was # cleaned, rather than the count. Just set it to 1 to # indicate something happened. - if type(did_clean) == bool: + if type(did_clean) is bool: did_clean = 1 if self._statsd: key = ('nodepool.provider.%s.leaked.floatingips'