← Back to branch summary

~ubuntu-branches/ubuntu/saucy/heat/saucy

« back to all changes in this revision

Viewing changes to heat/engine/resources/neutron/floatingip.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2013-09-08 21:51:19 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20130908215119-r939tu4aumqgdrkx
Tags: 2013.2~b3-0ubuntu1
[ Chuck Short ]
* New upstream release.
* debian/control: Add python-netaddr as build-dep.
* debian/heat-common.install: Remove heat-boto and associated man-page
* debian/heat-common.install: Remove heat-cfn and associated man-page
* debian/heat-common.install: Remove heat-watch and associated man-page
* debian/patches/fix-sqlalchemy-0.8.patch: Dropped

[ Adam Gandelman ]
* debian/patches/default-kombu.patch: Dropped.
* debian/patches/default-sqlite.patch: Refreshed.
* debian/*.install, rules: Install heat.conf.sample as common
  config file in heat-common. Drop other per-package configs, they
  are no longer used.
* debian/rules: Clean pbr .egg from build dir if it exists.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/engine/resources/neutron/floatingip.py
36
36
        # depend on any RouterGateway in this template with the same
37
37
        # network_id as this floating_network_id
38
38
        for resource in self.stack.resources.itervalues():
39
 
            if ((resource.type() == 'OS::Neutron::RouterGateway' or
40
 
                resource.type() == 'OS::Quantum::RouterGateway') and
 
39
            if (resource.has_interface('OS::Neutron::RouterGateway') and
41
40
                resource.properties.get('network_id') ==
42
41
                    self.properties.get('floating_network_id')):
43
42
                        deps += (self, resource)
105
104
    return {
106
105
        'OS::Neutron::FloatingIP': FloatingIP,
107
106
        'OS::Neutron::FloatingIPAssociation': FloatingIPAssociation,
108
 
        'OS::Quantum::FloatingIP': FloatingIP,
109
 
        'OS::Quantum::FloatingIPAssociation': FloatingIPAssociation,
110
107
    }