diff options
| author | Nachi Ueno <nachi@nttmcl.com> | 2012-08-10 23:04:58 +0000 |
|---|---|---|
| committer | Nachi Ueno <nachi@nttmcl.com> | 2012-08-10 23:04:58 +0000 |
| commit | dec1531f1defacfba77454c05acef229dab9bc06 (patch) | |
| tree | 206a98b4af8afeb34402fac3b70fcb316d0fe49c /nova/api | |
| parent | 2640f81754126c9d3ecd668eb99fb006f68b709b (diff) | |
Key config_drive off of config-drive extension
partially implements blueprint disable-server-extensions
Change-Id: I42743efeb74b3286c158589eb6af7b1d9ba215d5
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 6756338d8..85231a3ed 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -604,7 +604,9 @@ class Controller(wsgi.Controller): image_href = self._image_uuid_from_href(image_href) personality = server_dict.get('personality') - config_drive = server_dict.get('config_drive') + config_drive = None + if self.ext_mgr.is_loaded('os-config-drive'): + config_drive = server_dict.get('config_drive') injected_files = [] if personality: |