From da607b1682b9db98e1a83d14d060e7c8f890b514 Mon Sep 17 00:00:00 2001 From: ricolin Date: Tue, 15 Aug 2017 11:25:41 +0800 Subject: [PATCH] Reoder barbican container import Use non-deprecated path first, so there are no warning of use deprecated path. We will remove old path soon. Change-Id: I4472d6a57e77662bf639b4a8ece6a75da8e1c375 --- heat/engine/clients/os/barbican.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/heat/engine/clients/os/barbican.py b/heat/engine/clients/os/barbican.py index 65556e850a..8460984997 100644 --- a/heat/engine/clients/os/barbican.py +++ b/heat/engine/clients/os/barbican.py @@ -18,9 +18,9 @@ from heat.engine.clients import client_plugin from heat.engine import constraints try: - from barbicanclient import containers -except ImportError: from barbicanclient.v1 import containers +except ImportError: + from barbicanclient import containers CLIENT_NAME = 'barbican'