openstack
/
heat
Code Issues Proposed changes

Remove old import path in barbican 

Direct import of barbicanclient is being deprecated for
`barbicanclient.containers`, we should use
`barbicanclient.v1.containers` instead.

Change-Id: I340099ecf6649e7a443712a448a1504ec2e6d8ea
This commit is contained in:
ricolin 2017-12-09 01:04:02 +08:00
parent 004971b6f2
commit e4b711d0b6
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,17 +10,15 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from barbicanclient import client as barbican_client
from barbicanclient import exceptions
from barbicanclient.v1 import client as barbican_client
from barbicanclient.v1 import containers
from heat.common import exception
from heat.engine.clients import client_plugin
from heat.engine import constraints
try:
from barbicanclient.v1 import containers
except ImportError:
from barbicanclient import containers
CLIENT_NAME = 'barbican'