x
/
deb-os-cloud-config
Code Issues Proposed changes

Merge "use keystoneclient exceptions instead of oslo-incubator code"

This commit is contained in:
Jenkins 2016-01-08 00:20:07 +00:00 committed by Gerrit Code Review
parent 28ee8c1bf7 2ab267107a
commit e84ece166f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os_cloud_config/keystone.py
View File

@ -18,7 +18,7 @@ import logging
import subprocess
import time
from keystoneclient.openstack.common.apiclient import exceptions
from keystoneclient import exceptions
import keystoneclient.v2_0.client as ksclient_v2
import keystoneclient.v3.client as ksclient_v3
from six.moves.urllib.parse import urlparse

2
os_cloud_config/tests/test_keystone.py
View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from keystoneclient.openstack.common.apiclient import exceptions
from keystoneclient import exceptions
import keystoneclient.v2_0.client as ksclient_v2
import mock