diff options
| author | William Wolf <throughnothing@gmail.com> | 2011-08-18 22:24:31 -0400 |
|---|---|---|
| committer | William Wolf <throughnothing@gmail.com> | 2011-08-18 22:24:31 -0400 |
| commit | 254d45ac22c1f4f9cb6e6b02e7a416e5d94f401e (patch) | |
| tree | 1b20bd870c3e710803c9e6c1d386bc1c1ed392f4 /nova/api | |
| parent | a711bf61b274eb38face3957549acd4ee3c9b6a1 (diff) | |
| parent | 2d21bd0fdd392d9b3b79876c4962bf2757a3e679 (diff) | |
merge
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/auth.py | 1 | ||||
| -rw-r--r-- | nova/api/openstack/contrib/security_groups.py | 2 | ||||
| -rw-r--r-- | nova/api/openstack/create_instance_helper.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/nova/api/openstack/auth.py b/nova/api/openstack/auth.py index d14553cd4..b6ff1126b 100644 --- a/nova/api/openstack/auth.py +++ b/nova/api/openstack/auth.py @@ -113,7 +113,6 @@ class AuthMiddleware(wsgi.Middleware): LOG.warn(msg) return faults.Fault(webob.exc.HTTPUnauthorized(explanation=msg)) - # Gabe did this. def _get_auth_header(key): """Ensures that the KeyError returned is meaningful.""" try: diff --git a/nova/api/openstack/contrib/security_groups.py b/nova/api/openstack/contrib/security_groups.py index d1230df69..6c57fbb51 100644 --- a/nova/api/openstack/contrib/security_groups.py +++ b/nova/api/openstack/contrib/security_groups.py @@ -458,7 +458,7 @@ class SecurityGroupRulesXMLDeserializer(wsgi.MetadataXMLDeserializer): def _get_metadata(): metadata = { "attributes": { - "security_group": ["id", "project_id", "name"], + "security_group": ["id", "tenant_id", "name"], "rule": ["id", "parent_group_id"], "security_group_rule": ["id", "parent_group_id"], } diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py index b4a08dac0..978741682 100644 --- a/nova/api/openstack/create_instance_helper.py +++ b/nova/api/openstack/create_instance_helper.py @@ -122,6 +122,7 @@ class CreateInstanceHelper(object): raise exc.HTTPBadRequest(explanation=msg) zone_blob = server_dict.get('blob') + user_data = server_dict.get('user_data') availability_zone = server_dict.get('availability_zone') name = server_dict['name'] self._validate_server_name(name) @@ -163,6 +164,7 @@ class CreateInstanceHelper(object): reservation_id=reservation_id, min_count=min_count, max_count=max_count, + user_data=user_data, availability_zone=availability_zone)) except quota.QuotaError as error: self._handle_quota_error(error) |