diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-10 23:35:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-10 23:35:59 +0000 |
| commit | 649d3cea2a3c6a704612087e5ccca7cbe11ae0b3 (patch) | |
| tree | f4b8b7dbefac4d70054ab3cc1f252900aed8135a /nova/api | |
| parent | 7c62170c67fc60b6fd0ddd0239c40b9238a372d6 (diff) | |
| parent | dec1531f1defacfba77454c05acef229dab9bc06 (diff) | |
| download | nova-649d3cea2a3c6a704612087e5ccca7cbe11ae0b3.tar.gz nova-649d3cea2a3c6a704612087e5ccca7cbe11ae0b3.tar.xz nova-649d3cea2a3c6a704612087e5ccca7cbe11ae0b3.zip | |
Merge " Key config_drive off of config-drive extension"
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 e8ede37e7..217c67361 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: |