← Back to branch summary

~ubuntu-cloud-archive/ubuntu/precise/nova/trunk

« back to all changes in this revision

Viewing changes to nova/network/manager.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Soren Hansen
  • Date: 2012-09-07 17:49:53 UTC
  • mfrom: (1.1.61)
  • Revision ID: package-import@ubuntu.com-20120907174953-oapuvix1jxm830he
Tags: 2012.2~rc1~20120907.15996-0ubuntu1
https://launchpad.net/bugs/995285
[ Chuck Short ]
* New upstream release.
* debian/nova-common.postinst: Drop nova_sudoers permission changing
  since we do it in the debian/rules. (LP: #995285)

[ Soren Hansen ]
* Update debian/watch to account for symbolically named tarballs and
  use newer URL.
* Fix Launchpad URLs in debian/watch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/network/manager.py
388
388
 
389
389
    def _floating_ip_owned_by_project(self, context, floating_ip):
390
390
        """Raises if floating ip does not belong to project"""
 
391
        if context.is_admin:
 
392
            return
 
393
 
391
394
        if floating_ip['project_id'] != context.project_id:
392
395
            if floating_ip['project_id'] is None:
393
396
                LOG.warn(_('Address |%(address)s| is not allocated'),
1000
1003
                  context=read_deleted_context)
1001
1004
        # deallocate fixed ips
1002
1005
        for fixed_ip in fixed_ips:
1003
 
            self.deallocate_fixed_ip(context, fixed_ip['address'])
 
1006
            self.deallocate_fixed_ip(context, fixed_ip['address'],
 
1007
                host=kwargs.get('host'))
1004
1008
 
1005
1009
        # deallocate vifs (mac addresses)
1006
1010
        self.db.virtual_interface_delete_by_instance(read_deleted_context,