summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--heat/engine/clients/os/nova.py4
-rw-r--r--heat/engine/resources/aws/ec2/instance.py2
-rw-r--r--heat/engine/resources/openstack/nova/server.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/heat/engine/clients/os/nova.py b/heat/engine/clients/os/nova.py
index d8cd22a6f..b070764fc 100644
--- a/heat/engine/clients/os/nova.py
+++ b/heat/engine/clients/os/nova.py
@@ -48,7 +48,7 @@ CLIENT_NAME = 'nova'
class NovaClientPlugin(microversion_mixin.MicroversionMixin,
client_plugin.ClientPlugin):
- deferred_server_statuses = ['BUILD',
+ deferred_server_statuses = {'BUILD',
'HARD_REBOOT',
'PASSWORD',
'REBOOT',
@@ -57,7 +57,7 @@ class NovaClientPlugin(microversion_mixin.MicroversionMixin,
'REVERT_RESIZE',
'SHUTOFF',
'SUSPENDED',
- 'VERIFY_RESIZE']
+ 'VERIFY_RESIZE'}
exceptions_module = exceptions
diff --git a/heat/engine/resources/aws/ec2/instance.py b/heat/engine/resources/aws/ec2/instance.py
index 7311eb995..3cdd4b5d1 100644
--- a/heat/engine/resources/aws/ec2/instance.py
+++ b/heat/engine/resources/aws/ec2/instance.py
@@ -865,7 +865,7 @@ class Instance(resource.Resource, sh.SchedulerHintsMixin):
status = cp.get_status(server)
LOG.debug('%(name)s check_suspend_complete status = %(status)s',
{'name': self.name, 'status': status})
- if status in list(cp.deferred_server_statuses + ['ACTIVE']):
+ if status in (cp.deferred_server_statuses | {'ACTIVE'}):
return status == 'SUSPENDED'
else:
exc = exception.ResourceUnknownStatus(
diff --git a/heat/engine/resources/openstack/nova/server.py b/heat/engine/resources/openstack/nova/server.py
index 9d9b2df2f..c1fc2c2bb 100644
--- a/heat/engine/resources/openstack/nova/server.py
+++ b/heat/engine/resources/openstack/nova/server.py
@@ -1701,7 +1701,7 @@ class Server(server_base.BaseServer, sh.SchedulerHintsMixin,
status = cp.get_status(server)
LOG.debug('%(name)s check_suspend_complete status = %(status)s',
{'name': self.name, 'status': status})
- if status in list(cp.deferred_server_statuses + ['ACTIVE']):
+ if status in (cp.deferred_server_statuses | {'ACTIVE'}):
return status == 'SUSPENDED'
else:
exc = exception.ResourceUnknownStatus(