Import salt.utils.openstack.pyrax differently to avoid failed import by loader.

This commit is contained in:
C. R. Oldham 2015-02-27 14:41:06 -07:00
parent 36839dc394
commit 552f60a8f2

View File

@ -17,7 +17,10 @@ import salt.utils.cloud
import salt.config as config
# Import pyrax libraries
import salt.utils.openstack.pyrax as suop
# This is typically against SaltStack coding styles,
# it should be 'import salt.utils.openstack.pyrax as suop'. Something
# in the loader is creating a name clash and making that form fail
from salt.utils.openstack import pyrax as suop
# Only load in this module is the OPENSTACK configurations are in place