From 13d25ed7dc0005f89a0522eff3bf5e5cda30fb07 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Fri, 10 Aug 2012 15:39:55 -0400 Subject: Don't accept key_name if not enabled partially implements blueprint disable-server-extensions moves filling out key_name variable behind conditional only used when os-keypairs is enabled. Adds unit tests to ensure this behaves as expected (Remove debugging that was left in) Change-Id: I87ce041c2093c93a1a2456ef51357593e9de0681 --- 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 25a7e55e8..8f3e47eb8 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -641,7 +641,10 @@ class Controller(wsgi.Controller): raise exc.HTTPBadRequest(explanation=msg) # optional openstack extensions: - key_name = server_dict.get('key_name') + key_name = None + if self.ext_mgr.is_loaded('os-keypairs'): + key_name = server_dict.get('key_name') + user_data = None if self.ext_mgr.is_loaded('os-user-data'): user_data = server_dict.get('user_data') -- cgit