~ubuntu-branches/ubuntu/utopic/heat/utopic

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Gauvain Pocentek
  • Date: 2014-07-25 10:08:14 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20140725100814-86phhyxr90ugg3hr
Tags: 2014.2~b2-0ubuntu1
[ Chuck Short ]
* debian/control: Add python-oslo.messaging 
* debian/tests/heat-daemons: Dropped heat-enginge.
* debian/patches/fix-requirements.patch: Refreshed.
* debian/control: Add python-stevedore
* debian/control: Add python-posix-ipc.
* debian/patches/fix-requirements.patch: Remove routes 2.0 blockage.
* debian/patches/default-sqlite.patch: Refreshed.
* debian/patches/skip-tests.patch: Refreshed.
* debian/control: Add python-requests
* debian/rules: Temporarily disable testsuite.

[ Gauvain Pocentek ]
* debian/patches/default-log-dir.patch: define a default log directory to
  actually get logging to work (LP: #1320013).

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
#    under the License.
13
13
 
14
14
from heat.common import exception
15
 
from heat.engine import clients
16
15
from heat.engine import constraints
17
16
from heat.engine import properties
18
17
from heat.engine.resources.neutron import neutron
19
18
 
20
 
if clients.neutronclient is not None:
21
 
    import neutronclient.common.exceptions as neutron_exp
 
19
import neutronclient.common.exceptions as neutron_exp
22
20
 
23
21
 
24
22
class SecurityGroup(neutron.NeutronResource):