openstack/heat
Code Issues Proposed changes

Merge "Reoder barbican container import"

Browse Source
This commit is contained in:
Zuul 2017-10-20 12:01:37 +00:00 committed by Gerrit Code Review
commit 0670ed3429
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/engine/clients/os/barbican.py
View File

@ -18,9 +18,9 @@ from heat.engine.clients import client_plugin
from heat.engine import constraints from heat.engine import constraints
try: try:
from barbicanclient import containers
except ImportError:
from barbicanclient.v1 import containers from barbicanclient.v1 import containers
except ImportError:
from barbicanclient import containers
CLIENT_NAME = 'barbican' CLIENT_NAME = 'barbican'