From f54a91603933a9a67ee3ed7bb0010017bcc1193e Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Wed, 8 Aug 2012 17:27:38 -0400 Subject: Don't accept scheduler_hints if not enabled partially implements blueprint disable-server-extensions moves the filling out of the code behind a conditional to ensure this data is only passed if the extension is actually enabled Change-Id: If866eb87c9e6189b6948cb37f0cb8f5e26c8cced --- nova/api/openstack/compute/servers.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'nova/api') diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 6756338d8..1a6881f27 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -664,7 +664,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 -- cgit