diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-10 19:03:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-10 19:03:21 +0000 |
| commit | 3b0ef1fb2e3110fbedc75a30475d799599706ced (patch) | |
| tree | 670387a7483020cd438f57a66b3ed256517261c9 | |
| parent | aef2fbb2da6686310c2d928185fd947032a08a82 (diff) | |
| parent | 6291af275084db4fbda8803f794729b6a0f1ace3 (diff) | |
| download | nova-3b0ef1fb2e3110fbedc75a30475d799599706ced.tar.gz nova-3b0ef1fb2e3110fbedc75a30475d799599706ced.tar.xz nova-3b0ef1fb2e3110fbedc75a30475d799599706ced.zip | |
Merge "maint: compare singletons with 'is' not '=='"
| -rw-r--r-- | nova/compute/api.py | 2 | ||||
| -rw-r--r-- | nova/volume/storwize_svc.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index b7aa99d45..078b17106 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -792,7 +792,7 @@ class API(base.Base): # only going to create 1 instance. # This speeds up API responses for builds # as we don't need to wait for the scheduler. - create_instance_here = max_count == 1 or max_count == None + create_instance_here = max_count == 1 or max_count is None (instances, reservation_id) = self._create_instance( context, instance_type, diff --git a/nova/volume/storwize_svc.py b/nova/volume/storwize_svc.py index f5a3ed602..f87500f9b 100644 --- a/nova/volume/storwize_svc.py +++ b/nova/volume/storwize_svc.py @@ -413,7 +413,7 @@ class StorwizeSVCDriver(san.SanISCSIDriver): else: size = default_size - if getattr(FLAGS, 'storwize_svc_vol_autoexpand') == True: + if getattr(FLAGS, 'storwize_svc_vol_autoexpand'): autoexpand = '-autoexpand' else: autoexpand = '' |