diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-23 22:56:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-23 22:56:27 +0000 |
| commit | be0d90e14ad1f62293873d21c5617dc9eb3ce295 (patch) | |
| tree | 6bb94658b84b31514c70c4675d95478110dc63ad | |
| parent | 879799b3fd65559bcaf2bf36381cc3dd70b54eba (diff) | |
| parent | 8b894e0f411c184330acf70baec484609ebe11aa (diff) | |
| download | horizon-be0d90e14ad1f62293873d21c5617dc9eb3ce295.tar.gz | |
Merge "Trust sql middleware value conversion and stick to the spec type." into stable/liberty
| -rw-r--r-- | openstack_dashboard/dashboards/project/instances/tests.py | 2 | ||||
| -rw-r--r-- | openstack_dashboard/dashboards/project/instances/workflows/create_instance.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/openstack_dashboard/dashboards/project/instances/tests.py b/openstack_dashboard/dashboards/project/instances/tests.py index da40bddfc..6868db798 100644 --- a/openstack_dashboard/dashboards/project/instances/tests.py +++ b/openstack_dashboard/dashboards/project/instances/tests.py @@ -51,7 +51,7 @@ INDEX_URL = reverse('horizon:project:instances:index') SEC_GROUP_ROLE_PREFIX = \ workflows.update_instance.INSTANCE_SEC_GROUP_SLUG + "_role_" AVAILABLE = api.cinder.VOLUME_STATE_AVAILABLE -VOLUME_SEARCH_OPTS = dict(status=AVAILABLE, bootable=1) +VOLUME_SEARCH_OPTS = dict(status=AVAILABLE, bootable=True) SNAPSHOT_SEARCH_OPTS = dict(status=AVAILABLE) diff --git a/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py b/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py index 04898ac51..bc2bea9eb 100644 --- a/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py +++ b/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py @@ -471,7 +471,7 @@ class SetInstanceDetailsAction(workflows.Action): available = api.cinder.VOLUME_STATE_AVAILABLE volumes = [self._get_volume_display_name(v) for v in cinder.volume_list(self.request, - search_opts=dict(status=available, bootable=1))] + search_opts=dict(status=available, bootable=True))] except Exception: exceptions.handle(self.request, _('Unable to retrieve list of volumes.')) |