diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-10 23:05:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-10 23:05:02 +0000 |
| commit | 95dbc97a2ce7a9be585c7e7fe44ff0b9e8594b30 (patch) | |
| tree | a78bed1737bfc6db9fcafa593b16d47414f8fb40 /nova/api | |
| parent | faa0b5e88bba74437599ff3e7f250b6eb359339f (diff) | |
| parent | f54a91603933a9a67ee3ed7bb0010017bcc1193e (diff) | |
| download | nova-95dbc97a2ce7a9be585c7e7fe44ff0b9e8594b30.tar.gz nova-95dbc97a2ce7a9be585c7e7fe44ff0b9e8594b30.tar.xz nova-95dbc97a2ce7a9be585c7e7fe44ff0b9e8594b30.zip | |
Merge "Don't accept scheduler_hints if not enabled"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index b378d4139..41742df15 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -666,7 +666,10 @@ class Controller(wsgi.Controller): min_count = max_count auto_disk_config = server_dict.get('auto_disk_config') - scheduler_hints = server_dict.get('scheduler_hints', {}) + + scheduler_hints = {} + if self.ext_mgr.is_loaded('os-scheduler-hints'): + scheduler_hints = server_dict.get('scheduler_hints', {}) try: _get_inst_type = instance_types.get_instance_type_by_flavor_id |